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

fix(spanner): fix escaping of database name in spanner ddl with POSTGRES dialect #5938

Merged
merged 2 commits into from
Apr 15, 2022
Merged

fix(spanner): fix escaping of database name in spanner ddl with POSTGRES dialect #5938

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f43f382
fix(spanner): fix escaping of database name in spanner ddl with POSTG…
rahul2393 Apr 13, 2022
0b6ffa8
update spangres test to have "-" in the database name
rahul2393 Apr 13, 2022
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
2 changes: 1 addition & 1 deletion mmv1/templates/terraform/encoders/spanner_database.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
obj["createStatement"] = fmt.Sprintf("CREATE DATABASE `%s`", obj["name"])
if dialect, ok := obj["databaseDialect"]; ok && dialect == "POSTGRESQL" {
obj["createStatement"] = fmt.Sprintf("CREATE DATABASE %s", obj["name"])
obj["createStatement"] = fmt.Sprintf("CREATE DATABASE \"%s\"", obj["name"])
}
delete(obj, "name")
delete(obj, "instance")
Expand Down
4 changes: 2 additions & 2 deletions mmv1/third_party/terraform/tests/resource_spanner_database_test.go.erb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -170,7 +170,7 @@ resource "google_spanner_instance" "basic" {

resource "google_spanner_database" "basic_spangres" {
instance = google_spanner_instance.basic.name
name = "%s_spangres"
name = "%s-spangres"
database_dialect = "POSTGRESQL"
deletion_protection = false
}
Expand All @@ -188,7 +188,7 @@ resource "google_spanner_instance" "basic" {

resource "google_spanner_database" "basic_spangres" {
instance = google_spanner_instance.basic.name
name = "%s_spangres"
name = "%s-spangres"
database_dialect = "POSTGRESQL"
ddl = [
"CREATE TABLE t1 (t1 bigint NOT NULL PRIMARY KEY)",
Expand Down