From 614aba49961b091889315f6666c900cabd51d0d8 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Wed, 12 Sep 2018 10:50:35 -0400 Subject: [PATCH] JBAS-1832 Migrate 3.2 SQL to sqitch Signed-off-by: Bill Erickson --- .../sql/schema/deploy/2.12-3.2-db-upgrade-data.sql | 12 ++++-------- .../sql/schema/deploy/2.12-3.2-db-upgrade-schema.sql | 11 ++++------- KCLS/sql/schema/revert/2.12-3.2-db-upgrade-data.sql | 5 +++++ KCLS/sql/schema/revert/2.12-3.2-db-upgrade-schema.sql | 5 +++++ KCLS/sql/schema/sqitch.plan | 2 ++ 5 files changed, 20 insertions(+), 15 deletions(-) rename kcls-2.12-3.2-db-upgrade-data.sql => KCLS/sql/schema/deploy/2.12-3.2-db-upgrade-data.sql (95%) rename kcls-2.12-3.2-db-upgrade.sql => KCLS/sql/schema/deploy/2.12-3.2-db-upgrade-schema.sql (99%) create mode 100644 KCLS/sql/schema/revert/2.12-3.2-db-upgrade-data.sql create mode 100644 KCLS/sql/schema/revert/2.12-3.2-db-upgrade-schema.sql diff --git a/kcls-2.12-3.2-db-upgrade-data.sql b/KCLS/sql/schema/deploy/2.12-3.2-db-upgrade-data.sql similarity index 95% rename from kcls-2.12-3.2-db-upgrade-data.sql rename to KCLS/sql/schema/deploy/2.12-3.2-db-upgrade-data.sql index 5a158b8db9..a3df7e03da 100644 --- a/kcls-2.12-3.2-db-upgrade-data.sql +++ b/KCLS/sql/schema/deploy/2.12-3.2-db-upgrade-data.sql @@ -1,8 +1,5 @@ - ----------------------------------------------------------------------------- --- 2.12 -> 3.2 SQL DATA UPDATES --- No global transaction here. ----------------------------------------------------------------------------- +-- Deploy kcls-evergreen:2.12-3.2-db-upgrade-data to pg +-- requires: 2.12-3.2-db-upgrade-schema \set ON_ERROR_STOP on @@ -121,7 +118,6 @@ FROM internal_flag_state b WHERE a.name = b.name; -COMMIT; ---ROLLBACK; - +--COMMIT; +ROLLBACK; diff --git a/kcls-2.12-3.2-db-upgrade.sql b/KCLS/sql/schema/deploy/2.12-3.2-db-upgrade-schema.sql similarity index 99% rename from kcls-2.12-3.2-db-upgrade.sql rename to KCLS/sql/schema/deploy/2.12-3.2-db-upgrade-schema.sql index 2b16a8ae5a..1a83ec9e2e 100644 --- a/kcls-2.12-3.2-db-upgrade.sql +++ b/KCLS/sql/schema/deploy/2.12-3.2-db-upgrade-schema.sql @@ -1,10 +1,8 @@ +-- Deploy kcls-evergreen:2.12-3.2-db-upgrade-schema to pg +-- requires: ecard-notice-validator BEGIN; ----------------------------------------------------------------------------- --- BEGIN 2.12.6 -> 3.0.0 ----------------------------------------------------------------------------- - --Upgrade Script for 2.12.6 to 3.0.0 --\set eg_version '''3.0.0''' \set ON_ERROR_STOP on @@ -21491,6 +21489,5 @@ PERFORM evergreen.upgrade_deps_block_check('1129', '3.2.1'); END IF; END $INSERT$; -COMMIT; ---ROLLBACK; - +-- COMMIT; +ROLLBACK; diff --git a/KCLS/sql/schema/revert/2.12-3.2-db-upgrade-data.sql b/KCLS/sql/schema/revert/2.12-3.2-db-upgrade-data.sql new file mode 100644 index 0000000000..fe7f50799e --- /dev/null +++ b/KCLS/sql/schema/revert/2.12-3.2-db-upgrade-data.sql @@ -0,0 +1,5 @@ +-- Revert kcls-evergreen:2.12-3.2-db-upgrade-data from pg + +BEGIN; + +COMMIT; diff --git a/KCLS/sql/schema/revert/2.12-3.2-db-upgrade-schema.sql b/KCLS/sql/schema/revert/2.12-3.2-db-upgrade-schema.sql new file mode 100644 index 0000000000..3f851508ba --- /dev/null +++ b/KCLS/sql/schema/revert/2.12-3.2-db-upgrade-schema.sql @@ -0,0 +1,5 @@ +-- Revert kcls-evergreen:2.12-3.2-db-upgrade-schema from pg + +BEGIN; + +COMMIT; diff --git a/KCLS/sql/schema/sqitch.plan b/KCLS/sql/schema/sqitch.plan index c8143ada9e..da3722233c 100644 --- a/KCLS/sql/schema/sqitch.plan +++ b/KCLS/sql/schema/sqitch.plan @@ -75,3 +75,5 @@ ecard-notice-validator [remove-gender] 2018-07-26T14:33:57Z Bill Erickson,,, # Recover stock browse data tables, etc. stock-browse-headings-report [stock-browse-schema] 2018-10-04T15:56:18Z Bill Erickson,,, # New heading report updates for stock browse stock-browse-cleanup [stock-browse-schema] 2018-10-03T18:05:49Z Bill Erickson,,, # Delete old browse data +2.12-3.2-db-upgrade-schema [ecard-notice-validator] 2018-09-12T14:46:28Z Bill Erickson,,, # 2.12 to 3.2 DB update +2.12-3.2-db-upgrade-data [2.12-3.2-db-upgrade-schema] 2018-09-12T14:46:52Z Bill Erickson,,, # 2.12 to 3.2 post-update data -- 2.11.0