Trim statement leading and trailing whitespace.

Jonathan Whitaker · Jonathan Whitaker · commit 241ad96665c5 · 2019-10-03T14:35:37.000-06:00
The changes herein make sure Spanner DDL statements have leading and
trailing whitespace characters trimmed.
diff --git a/database/spanner/spanner.go b/database/spanner/spanner.go
@@ -309,6 +309,7 @@ func migrationStatements(migration []byte) []string {
 	allStatements := strings.Split(migrationString, ";")
 	nonEmptyStatements := allStatements[:0]
 	for _, s := range allStatements {
+		s = strings.TrimSpace(s)
 		if s != "" {
 			nonEmptyStatements = append(nonEmptyStatements, s)
 		}
diff --git a/database/spanner/spanner_test.go b/database/spanner/spanner_test.go
@@ -102,7 +102,7 @@ func TestMultistatementSplit(t *testing.T) {
 CREATE INDEX table_name_id_idx ON table_name (id);`,
 			expected: []string{`CREATE TABLE table_name (
 	id STRING(255) NOT NULL,
-) PRIMARY KEY(id)`, "\n\nCREATE INDEX table_name_id_idx ON table_name (id)"},
+) PRIMARY KEY(id)`, "CREATE INDEX table_name_id_idx ON table_name (id)"},
 		},
 		{
 			name: "multi statement, no trailing semicolon",
@@ -114,7 +114,7 @@ CREATE INDEX table_name_id_idx ON table_name (id);`,
 CREATE INDEX table_name_id_idx ON table_name (id)`,
 			expected: []string{`CREATE TABLE table_name (
 	id STRING(255) NOT NULL,
-) PRIMARY KEY(id)`, "\n\nCREATE INDEX table_name_id_idx ON table_name (id)"},
+) PRIMARY KEY(id)`, "CREATE INDEX table_name_id_idx ON table_name (id)"},
 		},
 	}
 

Original file line number	Diff line number	Diff line change
`@@ -309,6 +309,7 @@ func migrationStatements(migration []byte) []string {`
`309`	`309`	`allStatements := strings.Split(migrationString, ";")`
`310`	`310`	`nonEmptyStatements := allStatements[:0]`
`311`	`311`	`for _, s := range allStatements {`
	`312`	`+ s = strings.TrimSpace(s)`
`312`	`313`	`if s != "" {`
`313`	`314`	`nonEmptyStatements = append(nonEmptyStatements, s)`
`314`	`315`	`}`