Skip to content

Commit c9a99b7

Browse files
fix(spanner): fix escaping of database name in spanner ddl with POSTGRES dialect (#5938) (#4228)
Signed-off-by: Modular Magician <[email protected]>
1 parent c27e8ca commit c9a99b7

File tree

3 files changed

+6
-3
lines changed

3 files changed

+6
-3
lines changed

.changelog/5938.txt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
```release-note:bug
2+
spanner: fix escaping of database names with Postgres dialect in `google_spanner_database`
3+
```

google-beta/resource_spanner_database.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -556,7 +556,7 @@ func expandSpannerDatabaseInstance(v interface{}, d TerraformResourceData, confi
556556
func resourceSpannerDatabaseEncoder(d *schema.ResourceData, meta interface{}, obj map[string]interface{}) (map[string]interface{}, error) {
557557
obj["createStatement"] = fmt.Sprintf("CREATE DATABASE `%s`", obj["name"])
558558
if dialect, ok := obj["databaseDialect"]; ok && dialect == "POSTGRESQL" {
559-
obj["createStatement"] = fmt.Sprintf("CREATE DATABASE %s", obj["name"])
559+
obj["createStatement"] = fmt.Sprintf("CREATE DATABASE \"%s\"", obj["name"])
560560
}
561561
delete(obj, "name")
562562
delete(obj, "instance")

google-beta/resource_spanner_database_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -169,7 +169,7 @@ resource "google_spanner_instance" "basic" {
169169
170170
resource "google_spanner_database" "basic_spangres" {
171171
instance = google_spanner_instance.basic.name
172-
name = "%s_spangres"
172+
name = "%s-spangres"
173173
database_dialect = "POSTGRESQL"
174174
deletion_protection = false
175175
}
@@ -187,7 +187,7 @@ resource "google_spanner_instance" "basic" {
187187
188188
resource "google_spanner_database" "basic_spangres" {
189189
instance = google_spanner_instance.basic.name
190-
name = "%s_spangres"
190+
name = "%s-spangres"
191191
database_dialect = "POSTGRESQL"
192192
ddl = [
193193
"CREATE TABLE t1 (t1 bigint NOT NULL PRIMARY KEY)",

0 commit comments

Comments
 (0)