From 2fe199798507f414b4da306af5feb1423a196212 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Mon, 24 Jun 2019 15:51:42 -0400 Subject: [PATCH 1/3] adds "if exists" to the "drop column" statements in the flyway script for the gbr split. #5964 --- .../resources/db/migration/V4.14.0.2__2043-split-gbr-table.sql | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/db/migration/V4.14.0.2__2043-split-gbr-table.sql b/src/main/resources/db/migration/V4.14.0.2__2043-split-gbr-table.sql index b161a093497..235067d3fe7 100644 --- a/src/main/resources/db/migration/V4.14.0.2__2043-split-gbr-table.sql +++ b/src/main/resources/db/migration/V4.14.0.2__2043-split-gbr-table.sql @@ -1,4 +1,4 @@ begin; insert into filedownload(GUESTBOOKRESPONSE_ID,DOWNLOADTYPE,DOWNLOADTIMESTAMP,SESSIONID) select ID, DOWNLOADTYPE,RESPONSETIME,SESSIONID from guestbookresponse; -alter table guestbookresponse drop column DOWNLOADTYPE, drop column SESSIONID; +alter table guestbookresponse drop column if exists DOWNLOADTYPE, drop column if exists SESSIONID; commit; From c1f533a697b92191f9974cde3354229fcdf029a8 Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Mon, 24 Jun 2019 15:54:27 -0400 Subject: [PATCH 2/3] Also, renamed the flyway script, since the current version is 4.15 already! (#5964) --- ...43-split-gbr-table.sql => V4.15.0.1__2043-split-gbr-table.sql} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename src/main/resources/db/migration/{V4.14.0.2__2043-split-gbr-table.sql => V4.15.0.1__2043-split-gbr-table.sql} (100%) diff --git a/src/main/resources/db/migration/V4.14.0.2__2043-split-gbr-table.sql b/src/main/resources/db/migration/V4.15.0.1__2043-split-gbr-table.sql similarity index 100% rename from src/main/resources/db/migration/V4.14.0.2__2043-split-gbr-table.sql rename to src/main/resources/db/migration/V4.15.0.1__2043-split-gbr-table.sql From 1fcb06540e139df5fe9f9f14878c5841a8f33b4a Mon Sep 17 00:00:00 2001 From: Leonid Andreev Date: Tue, 25 Jun 2019 16:15:13 -0400 Subject: [PATCH 3/3] more (hopefully, last?) fixes for the flyway script. (#5964) --- .../migration/V4.15.0.1__2043-split-gbr-table.sql | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/src/main/resources/db/migration/V4.15.0.1__2043-split-gbr-table.sql b/src/main/resources/db/migration/V4.15.0.1__2043-split-gbr-table.sql index 235067d3fe7..adde91ee1b0 100644 --- a/src/main/resources/db/migration/V4.15.0.1__2043-split-gbr-table.sql +++ b/src/main/resources/db/migration/V4.15.0.1__2043-split-gbr-table.sql @@ -1,4 +1,10 @@ -begin; -insert into filedownload(GUESTBOOKRESPONSE_ID,DOWNLOADTYPE,DOWNLOADTIMESTAMP,SESSIONID) select ID, DOWNLOADTYPE,RESPONSETIME,SESSIONID from guestbookresponse; -alter table guestbookresponse drop column if exists DOWNLOADTYPE, drop column if exists SESSIONID; -commit; +DO $$ +BEGIN +IF EXISTS (SELECT 1 FROM information_schema.columns WHERE table_name='guestbookresponse' AND column_name='downloadtype') THEN + INSERT INTO filedownload(guestbookresponse_id, downloadtype, downloadtimestamp, sessionid) SELECT id, downloadtype, responsetime, sessionid FROM guestbookresponse; + ALTER TABLE guestbookresponse DROP COLUMN downloadtype, DROP COLUMN sessionid; +END IF; +END +$$ + +