Merge pull request #288 from jon-whit/master

Trim statement leading and trailing whitespace.
golang-migrate · Oct 15, 2019 · 7f20f01 · 7f20f01
2 parents 57b2ba7 + 241ad96
commit 7f20f01
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
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)"},
 		},
 	}