Merge pull request #12 from tomo241/master

Fix a bug in ParseSpannerType when parsing an ARRAY data type and fix…
cloudspannerecosystem · Apr 3, 2023 · 0236cb5 · 0236cb5
2 parents 0a71c86 + 5377c7a
commit 0236cb5
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 17 deletions.
diff --git a/pkg/schema/column_test.go b/pkg/schema/column_test.go
@@ -34,16 +34,6 @@ func TestColumn(t *testing.T) {
 				So(x.Base, ShouldEqual, spansql.Bool)
 			})
 
-			Convey("String", func() {
-				c := NewColumn()
-				c.SetSpannerType("STRING")
-
-				x := c.Type()
-				So(x, ShouldNotBeNil)
-				So(x.Array, ShouldBeFalse)
-				So(x.Base, ShouldEqual, spansql.String)
-			})
-
 			Convey("String(1024)", func() {
 				c := NewColumn()
 				c.SetSpannerType("STRING(1024)")
@@ -116,9 +106,19 @@ func TestColumn(t *testing.T) {
 				So(x.Base, ShouldEqual, spansql.Date)
 			})
 
-			Convey("ARRAY<STRING>", func() {
+			Convey("ARRAY<STRING(1024)>", func() {
+				c := NewColumn()
+				c.SetSpannerType("ARRAY<STRING(1024)>")
+
+				x := c.Type()
+				So(x, ShouldNotBeNil)
+				So(x.Array, ShouldBeTrue)
+				So(x.Base, ShouldEqual, spansql.String)
+			})
+
+			Convey("ARRAY<STRING(MAX)>", func() {
 				c := NewColumn()
-				c.SetSpannerType("ARRAY<STRING>")
+				c.SetSpannerType("ARRAY<STRING(MAX)>")
 
 				x := c.Type()
 				So(x, ShouldNotBeNil)

diff --git a/pkg/schema/type.go b/pkg/schema/type.go
@@ -36,6 +36,11 @@ func ParseSpannerType(spannerType string) spansql.Type {
 
 	dt := spannerType
 
+	if strings.HasPrefix(dt, "ARRAY<") {
+		ret.Array = true
+		dt = strings.TrimSuffix(strings.TrimPrefix(dt, "ARRAY<"), ">")
+	}
+
 	// separate type and length from dt with length such as STRING(32) or BYTES(256)
 	m := lengthRegexp.FindStringSubmatchIndex(dt)
 	if m != nil {
@@ -54,11 +59,6 @@ func ParseSpannerType(spannerType string) spansql.Type {
 		dt = dt[:m[0]] + dt[m[1]:]
 	}
 
-	if strings.HasPrefix(dt, "ARRAY<") {
-		ret.Array = true
-		dt = strings.TrimSuffix(strings.TrimPrefix(dt, "ARRAY<"), ">")
-	}
-
 	ret.Base = parseType(dt)
 
 	// Clip length for certain types