From 81a2868d693fcc0f4c5a001c5a2e5f760c721a00 Mon Sep 17 00:00:00 2001 From: Modular Magician Date: Tue, 8 Dec 2020 22:52:22 +0000 Subject: [PATCH] Remove string concatenation in spanner DB update (#4294) Signed-off-by: Modular Magician --- .changelog/4294.txt | 3 +++ google-beta/resource_spanner_database.go | 3 +-- google-beta/resource_spanner_database_test.go | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 .changelog/4294.txt diff --git a/.changelog/4294.txt b/.changelog/4294.txt new file mode 100644 index 0000000000..1ca050ea9b --- /dev/null +++ b/.changelog/4294.txt @@ -0,0 +1,3 @@ +```release-note:bug +spanner: fixed an issue in `google_spanner_database` where multi-statement updates were not formatted correctly +``` diff --git a/google-beta/resource_spanner_database.go b/google-beta/resource_spanner_database.go index 78eccca3a9..24fe4c21a8 100644 --- a/google-beta/resource_spanner_database.go +++ b/google-beta/resource_spanner_database.go @@ -19,7 +19,6 @@ import ( "fmt" "log" "reflect" - "strings" "time" "github.com/hashicorp/terraform-plugin-sdk/v2/helper/schema" @@ -475,7 +474,7 @@ func resourceSpannerDatabaseUpdateEncoder(d *schema.ResourceData, meta interface updateDdls = append(updateDdls, newDdls[i].(string)) } - obj["statements"] = strings.Join(updateDdls, ",") + obj["statements"] = updateDdls delete(obj, "name") delete(obj, "instance") delete(obj, "extraStatements") diff --git a/google-beta/resource_spanner_database_test.go b/google-beta/resource_spanner_database_test.go index c43dc0aadf..01a4fea4c6 100644 --- a/google-beta/resource_spanner_database_test.go +++ b/google-beta/resource_spanner_database_test.go @@ -109,6 +109,7 @@ resource "google_spanner_database" "basic" { "CREATE TABLE t1 (t1 INT64 NOT NULL,) PRIMARY KEY(t1)", "CREATE TABLE t2 (t2 INT64 NOT NULL,) PRIMARY KEY(t2)", "CREATE TABLE t3 (t3 INT64 NOT NULL,) PRIMARY KEY(t3)", + "CREATE TABLE t4 (t4 INT64 NOT NULL,) PRIMARY KEY(t4)", ] deletion_protection = false }