Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Trim statement leading and trailing whitespace. #288

Merged
merged 1 commit into from
Oct 15, 2019
+3 −2
Merged

Trim statement leading and trailing whitespace. #288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions database/spanner/spanner.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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)
}
Expand Down
4 changes: 2 additions & 2 deletions database/spanner/spanner_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand All @@ -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)"},
},
}

Expand Down