Skip to content

Commit 56d667e

Browse files
olavloiteolavloite
committed
Merge branch 'main' into spanner-lib
2 parents c25dcee + 675d6d2 commit 56d667e

File tree

15 files changed

+87
-3038
lines changed

15 files changed

+87
-3038
lines changed

‎.release-please-manifest.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
{
2-
".": "1.14.0"
2+
".": "1.15.0"
33
}

‎CHANGES.md‎

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,30 @@
11
# Changelog
22

3+
## [1.15.0](https://github.com/googleapis/go-sql-spanner/compare/v1.14.0...v1.15.0) (2025-06-27)
4+
5+
6+
### Features
7+
8+
* Add DirectExecuteQuery option ([#455](https://github.com/googleapis/go-sql-spanner/issues/455)) ([e2620e6](https://github.com/googleapis/go-sql-spanner/commit/e2620e6cdc537991f3301d0b8f71af9e69e2b479))
9+
* Add ExecuteBatchDml func with batch result ([#454](https://github.com/googleapis/go-sql-spanner/issues/454)) ([73c3fb0](https://github.com/googleapis/go-sql-spanner/commit/73c3fb05208463822834a7b671ded42645955b6e)), refs [#377](https://github.com/googleapis/go-sql-spanner/issues/377)
10+
* Add option to return metadata and stats ([#456](https://github.com/googleapis/go-sql-spanner/issues/456)) ([e001cd1](https://github.com/googleapis/go-sql-spanner/commit/e001cd1db3345ed9b0cf663893cff0f186f9da98))
11+
12+
13+
### Bug Fixes
14+
15+
* Include mutations from original attempt in retry ([#463](https://github.com/googleapis/go-sql-spanner/issues/463)) ([e285310](https://github.com/googleapis/go-sql-spanner/commit/e285310e72db13edea9ba13dbd78d10231eda54b))
16+
* Update all dependencies ([#446](https://github.com/googleapis/go-sql-spanner/issues/446)) ([3083c93](https://github.com/googleapis/go-sql-spanner/commit/3083c9372caf668e38a0a8a141c761710cbdad2c))
17+
* Update all dependencies ([#457](https://github.com/googleapis/go-sql-spanner/issues/457)) ([62ca7b4](https://github.com/googleapis/go-sql-spanner/commit/62ca7b43012aa670c46dca01d4ba8e4fe8f0188e))
18+
* Update module github.com/hashicorp/golang-lru to v2 ([#447](https://github.com/googleapis/go-sql-spanner/issues/447)) ([d30d6d1](https://github.com/googleapis/go-sql-spanner/commit/d30d6d1f622b172a6c58580325f663da92df2f6d))
19+
* Update module github.com/hashicorp/golang-lru to v2 ([#452](https://github.com/googleapis/go-sql-spanner/issues/452)) ([546cdaa](https://github.com/googleapis/go-sql-spanner/commit/546cdaa6f93e35941d88d9bba024a313197d52af))
20+
* Update module github.com/hashicorp/golang-lru to v2 ([#458](https://github.com/googleapis/go-sql-spanner/issues/458)) ([1b192c8](https://github.com/googleapis/go-sql-spanner/commit/1b192c83051620fa0fb41c9876eb1414dfd1e194))
21+
* Wrap AlreadyExists error for instance creation when autoConfigEmulator=true ([#450](https://github.com/googleapis/go-sql-spanner/issues/450)) ([3aa5ca2](https://github.com/googleapis/go-sql-spanner/commit/3aa5ca2cada7267f0f81fc27d3ec161ee6baf664))
22+
23+
24+
### Performance Improvements
25+
26+
* Avoid to string conversion in statement parser ([#453](https://github.com/googleapis/go-sql-spanner/issues/453)) ([e6f889a](https://github.com/googleapis/go-sql-spanner/commit/e6f889a6bd9cf3cb8d150fa529f97ac1560fa1d2))
27+
328
## [1.14.0](https://github.com/googleapis/go-sql-spanner/compare/v1.13.2...v1.14.0) (2025-06-05)
429

530

‎benchmarks/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ toolchain go1.24.4
77
replace github.com/googleapis/go-sql-spanner => ../
88

99
require (
10-
cloud.google.com/go v0.121.2
10+
cloud.google.com/go v0.121.3
1111
cloud.google.com/go/spanner v1.82.1-0.20250625132714-fe377af799f0
1212
github.com/google/uuid v1.6.0
1313
github.com/googleapis/go-sql-spanner v1.14.0
14-
google.golang.org/api v0.237.0
14+
google.golang.org/api v0.239.0
1515
google.golang.org/grpc v1.73.0
1616
google.golang.org/protobuf v1.36.6
1717
)
@@ -38,7 +38,7 @@ require (
3838
github.com/google/s2a-go v0.1.9 // indirect
3939
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
4040
github.com/googleapis/gax-go/v2 v2.14.2 // indirect
41-
github.com/hashicorp/golang-lru v0.6.0 // indirect
41+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
4242
github.com/planetscale/vtprotobuf v0.6.1-0.20240319094008-0393e58bdf10 // indirect
4343
github.com/spiffe/go-spiffe/v2 v2.5.0 // indirect
4444
github.com/zeebo/errs v1.4.0 // indirect

‎benchmarks/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRY
3838
cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
3939
cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I=
4040
cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
41-
cloud.google.com/go v0.121.2 h1:v2qQpN6Dx9x2NmwrqlesOt3Ys4ol5/lFZ6Mg1B7OJCg=
42-
cloud.google.com/go v0.121.2/go.mod h1:nRFlrHq39MNVWu+zESP2PosMWA0ryJw8KUBZ2iZpxbw=
41+
cloud.google.com/go v0.121.3 h1:84RD+hQXNdY5Sw/MWVAx5O9Aui/rd5VQ9HEcdN19afo=
42+
cloud.google.com/go v0.121.3/go.mod h1:6vWF3nJWRrEUv26mMB3FEIU/o1MQNVPG1iHdisa2SJc=
4343
cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4=
4444
cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
4545
cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E=
@@ -829,8 +829,8 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.7.0/go.mod h1:hgWBS7lorOAVIJEQMi4Zs
829829
github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU0GSB0f8Nhgmxx0VIRUvaC0w=
830830
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
831831
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
832-
github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4=
833-
github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
832+
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
833+
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
834834
github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
835835
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
836836
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -1365,8 +1365,8 @@ google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/
13651365
google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI=
13661366
google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0=
13671367
google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg=
1368-
google.golang.org/api v0.237.0 h1:MP7XVsGZesOsx3Q8WVa4sUdbrsTvDSOERd3Vh4xj/wc=
1369-
google.golang.org/api v0.237.0/go.mod h1:cOVEm2TpdAGHL2z+UwyS+kmlGr3bVWQQ6sYEqkKje50=
1368+
google.golang.org/api v0.239.0 h1:2hZKUnFZEy81eugPs4e2XzIJ5SOwQg0G82bpXD65Puo=
1369+
google.golang.org/api v0.239.0/go.mod h1:cOVEm2TpdAGHL2z+UwyS+kmlGr3bVWQQ6sYEqkKje50=
13701370
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
13711371
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
13721372
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=

‎driver.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ import (
4545
"google.golang.org/grpc/status"
4646
)
4747

48-
const userAgent = "go-sql-spanner/1.14.0" // x-release-please-version
48+
const userAgent = "go-sql-spanner/1.15.0" // x-release-please-version
4949

5050
const gormModule = "github.com/googleapis/go-gorm-spanner"
5151
const gormUserAgent = "go-gorm-spanner"

‎driver_with_mockserver_test.go‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ import (
3838
"github.com/google/go-cmp/cmp/cmpopts"
3939
"github.com/google/uuid"
4040
"github.com/googleapis/go-sql-spanner/testutil"
41-
lru "github.com/hashicorp/golang-lru"
41+
lru "github.com/hashicorp/golang-lru/v2"
4242
"google.golang.org/api/option"
4343
"google.golang.org/grpc"
4444
"google.golang.org/grpc/metadata"
@@ -83,7 +83,7 @@ func TestStatementCacheSize(t *testing.T) {
8383
if err != nil {
8484
t.Fatalf("unexpected error for connection: %v", err)
8585
}
86-
var cache *lru.Cache
86+
var cache *lru.Cache[string, *statementsCacheEntry]
8787
if err := c.Raw(func(driverConn any) error {
8888
sc, ok := driverConn.(*conn)
8989
if !ok {
@@ -150,7 +150,7 @@ func TestDisableStatementCache(t *testing.T) {
150150
if err != nil {
151151
t.Fatalf("unexpected error for connection: %v", err)
152152
}
153-
var cache *lru.Cache
153+
var cache *lru.Cache[string, *statementsCacheEntry]
154154
if err := c.Raw(func(driverConn any) error {
155155
sc, ok := driverConn.(*conn)
156156
if !ok {

‎examples/go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,13 +7,13 @@ toolchain go1.24.2
77
replace github.com/googleapis/go-sql-spanner => ../
88

99
require (
10-
cloud.google.com/go v0.121.2
10+
cloud.google.com/go v0.121.3
1111
cloud.google.com/go/spanner v1.82.1-0.20250625132714-fe377af799f0
1212
github.com/docker/docker v28.1.1+incompatible
1313
github.com/docker/go-connections v0.5.0
1414
github.com/googleapis/go-sql-spanner v1.0.1
1515
github.com/testcontainers/testcontainers-go v0.35.0
16-
google.golang.org/api v0.237.0
16+
google.golang.org/api v0.239.0
1717
)
1818

1919
require (
@@ -51,7 +51,7 @@ require (
5151
github.com/google/uuid v1.6.0 // indirect
5252
github.com/googleapis/enterprise-certificate-proxy v0.3.6 // indirect
5353
github.com/googleapis/gax-go/v2 v2.14.2 // indirect
54-
github.com/hashicorp/golang-lru v0.6.0 // indirect
54+
github.com/hashicorp/golang-lru/v2 v2.0.7 // indirect
5555
github.com/klauspost/compress v1.18.0 // indirect
5656
github.com/lufia/plan9stats v0.0.0-20211012122336-39d0f177ccd0 // indirect
5757
github.com/magiconair/properties v1.8.7 // indirect

‎examples/go.sum‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -38,8 +38,8 @@ cloud.google.com/go v0.104.0/go.mod h1:OO6xxXdJyvuJPcEPBLN9BJPD+jep5G1+2U5B5gkRY
3838
cloud.google.com/go v0.105.0/go.mod h1:PrLgOJNe5nfE9UMxKxgXj4mD3voiP+YQ6gdt6KMFOKM=
3939
cloud.google.com/go v0.107.0/go.mod h1:wpc2eNrD7hXUTy8EKS10jkxpZBjASrORK7goS+3YX2I=
4040
cloud.google.com/go v0.110.0/go.mod h1:SJnCLqQ0FCFGSZMUNUf84MV3Aia54kn7pi8st7tMzaY=
41-
cloud.google.com/go v0.121.2 h1:v2qQpN6Dx9x2NmwrqlesOt3Ys4ol5/lFZ6Mg1B7OJCg=
42-
cloud.google.com/go v0.121.2/go.mod h1:nRFlrHq39MNVWu+zESP2PosMWA0ryJw8KUBZ2iZpxbw=
41+
cloud.google.com/go v0.121.3 h1:84RD+hQXNdY5Sw/MWVAx5O9Aui/rd5VQ9HEcdN19afo=
42+
cloud.google.com/go v0.121.3/go.mod h1:6vWF3nJWRrEUv26mMB3FEIU/o1MQNVPG1iHdisa2SJc=
4343
cloud.google.com/go/accessapproval v1.4.0/go.mod h1:zybIuC3KpDOvotz59lFe5qxRZx6C75OtwbisN56xYB4=
4444
cloud.google.com/go/accessapproval v1.5.0/go.mod h1:HFy3tuiGvMdcd/u+Cu5b9NkO1pEICJ46IR82PoUdplw=
4545
cloud.google.com/go/accessapproval v1.6.0/go.mod h1:R0EiYnwV5fsRFiKZkPHr6mwyk2wxUJ30nL4j2pcFY2E=
@@ -863,8 +863,8 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0 h1:bkypFPDjIYGfCYD5mRBvpqxfYX1
863863
github.com/grpc-ecosystem/grpc-gateway/v2 v2.20.0/go.mod h1:P+Lt/0by1T8bfcF3z737NnSbmxQAppXMRziHUxPOC8k=
864864
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
865865
github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
866-
github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4=
867-
github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
866+
github.com/hashicorp/golang-lru/v2 v2.0.7 h1:a+bsQ5rvGLjzHuww6tVxozPZFVghXaHOwFs4luLUK2k=
867+
github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
868868
github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
869869
github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
870870
github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
@@ -1471,8 +1471,8 @@ google.golang.org/api v0.108.0/go.mod h1:2Ts0XTHNVWxypznxWOYUeI4g3WdP9Pk2Qk58+a/
14711471
google.golang.org/api v0.110.0/go.mod h1:7FC4Vvx1Mooxh8C5HWjzZHcavuS2f6pmJpZx60ca7iI=
14721472
google.golang.org/api v0.111.0/go.mod h1:qtFHvU9mhgTJegR31csQ+rwxyUTHOKFqCKWp1J0fdw0=
14731473
google.golang.org/api v0.114.0/go.mod h1:ifYI2ZsFK6/uGddGfAD5BMxlnkBqCmqHSDUVi45N5Yg=
1474-
google.golang.org/api v0.237.0 h1:MP7XVsGZesOsx3Q8WVa4sUdbrsTvDSOERd3Vh4xj/wc=
1475-
google.golang.org/api v0.237.0/go.mod h1:cOVEm2TpdAGHL2z+UwyS+kmlGr3bVWQQ6sYEqkKje50=
1474+
google.golang.org/api v0.239.0 h1:2hZKUnFZEy81eugPs4e2XzIJ5SOwQg0G82bpXD65Puo=
1475+
google.golang.org/api v0.239.0/go.mod h1:cOVEm2TpdAGHL2z+UwyS+kmlGr3bVWQQ6sYEqkKje50=
14761476
google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
14771477
google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=
14781478
google.golang.org/appengine v1.5.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7/EB5XEv4=

‎go.mod‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,15 @@ go 1.24
55
toolchain go1.24.4
66

77
require (
8-
cloud.google.com/go v0.121.2
8+
cloud.google.com/go v0.121.3
99
cloud.google.com/go/longrunning v0.6.7
1010
cloud.google.com/go/spanner v1.82.1-0.20250625132714-fe377af799f0
1111
github.com/golang/protobuf v1.5.4
1212
github.com/google/go-cmp v0.7.0
1313
github.com/google/uuid v1.6.0
1414
github.com/googleapis/gax-go/v2 v2.14.2
15-
github.com/hashicorp/golang-lru v0.6.0
16-
google.golang.org/api v0.237.0
15+
github.com/hashicorp/golang-lru/v2 v2.0.7
16+
google.golang.org/api v0.239.0
1717
google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822
1818
google.golang.org/grpc v1.73.0
1919
google.golang.org/protobuf v1.36.6

0 commit comments

Comments
 (0)