feat(spanner): fix schema naming (googleapis#10194)

eliben · May 16, 2024 · 215e0c8 · 215e0c8
1 parent 0a86d50
commit 215e0c8
Show file tree

Hide file tree

Showing 6 changed files with 97 additions and 90 deletions.
diff --git a/spanner/integration_test.go b/spanner/integration_test.go
@@ -2271,19 +2271,19 @@ func TestIntegration_BasicTypes_ProtoColumns(t *testing.T) {
 	defer cancel()
 	stmts := []string{
 		`CREATE PROTO BUNDLE (
-					spanner.examples.music.SingerInfo,
-					spanner.examples.music.Genre,
+					examples.spanner.music.SingerInfo,
+					examples.spanner.music.Genre,
 				)`,
 		`CREATE TABLE Types (
 					RowID		INT64 NOT NULL,
 					Int64a		INT64,
 					Bytes		BYTES(MAX),
 					Int64Array	ARRAY<INT64>,
 					BytesArray	ARRAY<BYTES(MAX)>,
-					ProtoMessage    spanner.examples.music.SingerInfo,
-					ProtoEnum   spanner.examples.music.Genre,
-					ProtoMessageArray   ARRAY<spanner.examples.music.SingerInfo>,
-					ProtoEnumArray  ARRAY<spanner.examples.music.Genre>,
+					ProtoMessage    examples.spanner.music.SingerInfo,
+					ProtoEnum   examples.spanner.music.Genre,
+					ProtoMessageArray   ARRAY<examples.spanner.music.SingerInfo>,
+					ProtoEnumArray  ARRAY<examples.spanner.music.Genre>,
 			) PRIMARY KEY (RowID)`,
 	}
 
@@ -2512,19 +2512,19 @@ func TestIntegration_BasicTypes_ProtoColumns_Errors(t *testing.T) {
 	defer cancel()
 	stmts := []string{
 		`CREATE PROTO BUNDLE (
-					spanner.examples.music.SingerInfo,
-					spanner.examples.music.Genre,
+					examples.spanner.music.SingerInfo,
+					examples.spanner.music.Genre,
 				)`,
 		`CREATE TABLE Types (
 					RowID		INT64 NOT NULL,
 					Int64a		INT64,
 					Bytes		BYTES(MAX),
 					Int64Array	ARRAY<INT64>,
 					BytesArray	ARRAY<BYTES(MAX)>,
-					ProtoMessage    spanner.examples.music.SingerInfo,
-					ProtoEnum   spanner.examples.music.Genre,
-					ProtoMessageArray   ARRAY<spanner.examples.music.SingerInfo>,
-					ProtoEnumArray  ARRAY<spanner.examples.music.Genre>,
+					ProtoMessage    examples.spanner.music.SingerInfo,
+					ProtoEnum   examples.spanner.music.Genre,
+					ProtoMessageArray   ARRAY<examples.spanner.music.SingerInfo>,
+					ProtoEnumArray  ARRAY<examples.spanner.music.Genre>,
 			) PRIMARY KEY (RowID)`,
 	}
 	protoDescriptor := readProtoDescriptorFile()
@@ -2607,15 +2607,15 @@ func TestIntegration_ProtoColumns_DML_ParameterizedQueries_Pk_Indexes(t *testing
 	defer cancel()
 	stmts := []string{
 		`CREATE PROTO BUNDLE (
-					spanner.examples.music.SingerInfo,
-					spanner.examples.music.Genre,
+					examples.spanner.music.SingerInfo,
+					examples.spanner.music.Genre,
 				)`,
 		`CREATE TABLE Singers (
 				 SingerId   INT64 NOT NULL,
 				 FirstName  STRING(1024),
 				 LastName   STRING(1024),
-				 SingerInfo spanner.examples.music.SingerInfo,
-				 SingerGenre spanner.examples.music.Genre,
+				 SingerInfo examples.spanner.music.SingerInfo,
+				 SingerGenre examples.spanner.music.Genre,
 				 SingerNationality STRING(1024) AS (SingerInfo.nationality) STORED,
 				) PRIMARY KEY (SingerNationality, SingerGenre)`,
 		`CREATE INDEX SingerByNationalityAndGenre ON Singers(SingerNationality, SingerGenre) STORING (SingerId, FirstName, LastName)`,

diff --git a/spanner/testdata/protos/README.md b/spanner/testdata/protos/README.md
@@ -0,0 +1,5 @@
+#### To generate singer.pb.go and descriptors.pb file from singer.proto using `protoc`
+```shell
+cd spanner/testdata
+protoc --proto_path=protos/ --include_imports --descriptor_set_out=protos/descriptors.pb --go_out=protos/ protos/singer.proto
+```
diff --git a/spanner/testdata/protos/descriptors.pb b/spanner/testdata/protos/descriptors.pb
diff --git a/spanner/testdata/protos/singer.pb.go b/spanner/testdata/protos/singer.pb.go
diff --git a/spanner/testdata/protos/singer.proto b/spanner/testdata/protos/singer.proto
@@ -16,8 +16,8 @@ limitations under the License.
 
 syntax = "proto2";
 
-package spanner.examples.music;
-option go_package = "./protos";
+package examples.spanner.music;
+option go_package = "./";
 
 message SingerInfo {
   optional int64 singer_id = 1;

diff --git a/spanner/value_test.go b/spanner/value_test.go
@@ -295,8 +295,8 @@ func TestEncodeValue(t *testing.T) {
 		Nationality: proto.String("Country2"),
 		Genre:       &singer2ProtoEnum,
 	}
-	protoMessagefqn := "spanner.examples.music.SingerInfo"
-	protoEnumfqn := "spanner.examples.music.Genre"
+	protoMessagefqn := "examples.spanner.music.SingerInfo"
+	protoEnumfqn := "examples.spanner.music.Genre"
 
 	var (
 		tString       = stringType()
@@ -1536,8 +1536,8 @@ func TestDecodeValue(t *testing.T) {
 		Nationality: proto.String("Country2"),
 		Genre:       &singer2ProtoEnum,
 	}
-	protoMessagefqn := "spanner.examples.music.SingerInfo"
-	protoEnumfqn := "spanner.examples.music.Genre"
+	protoMessagefqn := "examples.spanner.music.SingerInfo"
+	protoEnumfqn := "examples.spanner.music.Genre"
 
 	for _, test := range []struct {
 		desc      string