Merge branch 'main' into spanner-lib

Author: olavloite

aborted_transactions_test.go

@@ -919,7 +919,7 @@ func TestBatchUpdateAbortedWithError(t *testing.T) {
 		t.Fatalf("error code mismatch\nGot: %v\nWant: %v", spanner.ErrCode(err), codes.NotFound)
 	}
 
-	// Abort the transaction. The internal retry should succeed as teh same error
+	// Abort the transaction. The internal retry should succeed as the same error
 	// and the same row count is returned during the retry.
 	server.TestSpanner.PutExecutionTime(testutil.MethodCommitTransaction, testutil.SimulatedExecutionTime{
 		Errors: []error{status.Error(codes.Aborted, "Aborted")},

emulator_util.go

@@ -64,7 +64,7 @@ func createInstance(projectId, instanceId string) error {
 		},
 	})
 	if err != nil {
-		return fmt.Errorf("could not create instance %s: %v", fmt.Sprintf("projects/%s/instances/%s", projectId, instanceId), err)
+		return fmt.Errorf("could not create instance %s: %w", fmt.Sprintf("projects/%s/instances/%s", projectId, instanceId), err)
 	}
 	// Wait for the instance creation to finish.
 	if _, err := op.Wait(ctx); err != nil {

go.mod

@@ -13,7 +13,6 @@ require (
 	github.com/google/uuid v1.6.0
 	github.com/googleapis/gax-go/v2 v2.14.2
 	github.com/hashicorp/golang-lru v0.5.1
-	github.com/hashicorp/golang-lru/v2 v2.0.7
 	google.golang.org/api v0.236.0
 	google.golang.org/genproto/googleapis/rpc v0.0.0-20250603155806-513f23925822
 	google.golang.org/grpc v1.73.0

go.sum

@@ -830,9 +830,6 @@ github.com/grpc-ecosystem/grpc-gateway/v2 v2.11.3/go.mod h1:o//XUCC/F+yRGJoPO/VU
 github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
 github.com/hashicorp/golang-lru v0.5.1 h1:0hERBMJE1eitiLkihrMvRVBYAkpHzc/J3QdDN+dAcgU=
 github.com/hashicorp/golang-lru v0.5.1/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
-github.com/hashicorp/golang-lru v0.6.0 h1:uL2shRDx7RTrOrTCUZEGP/wJUFiUI8QT6E7z5o8jga4=
-github.com/hashicorp/golang-lru v0.6.0/go.mod h1:iADmTwqILo4mZ8BN3D2Q6+9jd8WM5uGBxy+E8yxSoD4=
-github.com/hashicorp/golang-lru/v2 v2.0.7/go.mod h1:QeFd9opnmA6QUJc5vARoKUSoFhyfM2/ZepoAG6RGpeM=
 github.com/iancoleman/strcase v0.2.0/go.mod h1:iwCmte+B7n89clKwxIoIXy/HfoL7AsD47ZCWhYzw7ho=
 github.com/ianlancetaylor/demangle v0.0.0-20181102032728-5e5cf60278f6/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=
 github.com/ianlancetaylor/demangle v0.0.0-20200824232613-28f6c0f3b639/go.mod h1:aSSvb/t6k1mPoxDqO4vJh6VOCGPwU4O0C2/Eqndh1Sc=

integration_test.go

@@ -270,6 +270,34 @@ func skipIfEmulator(t *testing.T, msg string) {
 	}
 }
 
+func TestAutoConfigEmulator(t *testing.T) {
+	skipIfShort(t)
+	if !runsOnEmulator() {
+		t.Skip("autoConfigEmulator=true only works when connected to the emulator")
+	}
+	t.Parallel()
+
+	ctx := context.Background()
+	for range 2 {
+		db, err := sql.Open("spanner", "projects/emulator-project/instances/test-instance/databases/test-database;autoConfigEmulator=true")
+		if err != nil {
+			t.Fatalf("could not connect to emulator: %v", err)
+		}
+		row := db.QueryRowContext(ctx, "select 1")
+		if row.Err() != nil {
+			t.Fatalf("could not execute select 1: %v", row.Err())
+		}
+		var v int64
+		if err := row.Scan(&v); err != nil {
+			t.Fatalf("could not scan value from select 1: %v", err)
+		}
+		if g, w := v, int64(1); g != w {
+			t.Fatalf("value mismatch:\n Got %d\nWant %d", g, w)
+		}
+		_ = db.Close()
+	}
+}
+
 func TestQueryContext(t *testing.T) {
 	skipIfShort(t)
 	t.Parallel()

statement_parser.go

@@ -712,14 +712,14 @@ func (p *statementParser) calculateFindParamsResult(sql string) (string, []strin
 	for parser.pos < len(parser.sql) {
 		startPos := parser.pos
 		parser.skipWhitespacesAndComments()
-		parsedSQL.WriteString(string(parser.sql[startPos:parser.pos]))
+		parsedSQL.Write(parser.sql[startPos:parser.pos])
 		if parser.pos >= len(parser.sql) {
 			break
 		}
 		if parser.isMultibyte() {
 			startPos = parser.pos
 			parser.nextChar()
-			parsedSQL.WriteString(string(parser.sql[startPos:parser.pos]))
+			parsedSQL.Write(parser.sql[startPos:parser.pos])
 			continue
 		}
 		c := parser.sql[parser.pos]
@@ -772,7 +772,7 @@ func (p *statementParser) calculateFindParamsResult(sql string) (string, []strin
 			if err != nil {
 				return sql, nil, err
 			}
-			parsedSQL.WriteString(string(parser.sql[startPos:newPos]))
+			parsedSQL.Write(parser.sql[startPos:newPos])
 			parser.pos = newPos
 		}
 	}