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

…RES dialect (#5938) (#11518) Signed-off-by: Modular Magician <[email protected]>
hashicorp · Apr 15, 2022 · f8da56e · f8da56e
1 parent 45572c2
commit f8da56e
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/.changelog/5938.txt b/.changelog/5938.txt
@@ -0,0 +1,3 @@
+```release-note:bug
+spanner: fix escaping of database names with Postgres dialect in `google_spanner_database`
+```
diff --git a/google/resource_spanner_database.go b/google/resource_spanner_database.go
@@ -556,7 +556,7 @@ func expandSpannerDatabaseInstance(v interface{}, d TerraformResourceData, confi
 func resourceSpannerDatabaseEncoder(d *schema.ResourceData, meta interface{}, obj map[string]interface{}) (map[string]interface{}, error) {
 	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/google/resource_spanner_database_test.go b/google/resource_spanner_database_test.go
@@ -169,7 +169,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
 }
@@ -187,7 +187,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)",