fix(spanner): fix escaping of database name in spanner ddl with POSTG…

…RES dialect (GoogleCloudPlatform#5938)
betsy-lichtenberg · Apr 25, 2022 · 139556e · 139556e
1 parent 48db71a
commit 139556e
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/mmv1/templates/terraform/encoders/spanner_database.go.erb b/mmv1/templates/terraform/encoders/spanner_database.go.erb
@@ -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")

diff --git a/mmv1/third_party/terraform/tests/resource_spanner_database_test.go.erb b/mmv1/third_party/terraform/tests/resource_spanner_database_test.go.erb
@@ -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
 }
@@ -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)",