From 54bb228ba9cb54acc429fa5fa1a41730dbc3b204 Mon Sep 17 00:00:00 2001 From: Bill Erickson Date: Fri, 14 Aug 2015 14:12:32 -0400 Subject: [PATCH] JBAS-654 Port blanket PO DB changes to sqitch Signed-off-by: Bill Erickson --- KCLS/sql/jbas-654/jbas-654-acq-blanket-orders.sql | 11 ----------- KCLS/sql/schema/deploy/blanket-po.sql | 19 +++++++++++++++++++ .../revert/blanket-po.sql} | 6 ++++-- KCLS/sql/schema/sqitch.plan | 1 + KCLS/sql/schema/verify/blanket-po.sql | 7 +++++++ 5 files changed, 31 insertions(+), 13 deletions(-) delete mode 100644 KCLS/sql/jbas-654/jbas-654-acq-blanket-orders.sql create mode 100644 KCLS/sql/schema/deploy/blanket-po.sql rename KCLS/sql/{jbas-654/jbas-654-acq-blanket-orders.UNDO.sql => schema/revert/blanket-po.sql} (80%) create mode 100644 KCLS/sql/schema/verify/blanket-po.sql diff --git a/KCLS/sql/jbas-654/jbas-654-acq-blanket-orders.sql b/KCLS/sql/jbas-654/jbas-654-acq-blanket-orders.sql deleted file mode 100644 index 0bfa085cb7..0000000000 --- a/KCLS/sql/jbas-654/jbas-654-acq-blanket-orders.sql +++ /dev/null @@ -1,11 +0,0 @@ -BEGIN; - -ALTER TABLE acq.invoice_item_type - ADD COLUMN blanket BOOLEAN NOT NULL DEFAULT FALSE, - ADD CONSTRAINT aiit_not_blanket_and_prorate - CHECK (blanket IS FALSE OR prorate IS FALSE); - -INSERT INTO acq.invoice_item_type (code, blanket, name) VALUES ( - 'BLA', TRUE, oils_i18n_gettext('BLA', 'Blanket Order', 'aiit', 'name')); - -COMMIT; diff --git a/KCLS/sql/schema/deploy/blanket-po.sql b/KCLS/sql/schema/deploy/blanket-po.sql new file mode 100644 index 0000000000..1d8ee82e46 --- /dev/null +++ b/KCLS/sql/schema/deploy/blanket-po.sql @@ -0,0 +1,19 @@ +-- Deploy kcls-evergreen:blanket-po to pg +-- requires: copy-stat-checkout-ok + +BEGIN; + +ALTER TABLE acq.invoice_item_type + ADD COLUMN blanket BOOLEAN NOT NULL DEFAULT FALSE, + ADD CONSTRAINT aiit_not_blanket_and_prorate + CHECK (blanket IS FALSE OR prorate IS FALSE); + +DO $$ +BEGIN + IF evergreen.mangle_data_on_deploy() THEN + INSERT INTO acq.invoice_item_type (code, blanket, name) VALUES ( + 'BLA', TRUE, oils_i18n_gettext('BLA', 'Blanket Order', 'aiit', 'name')); + END IF; +END $$; + +COMMIT; diff --git a/KCLS/sql/jbas-654/jbas-654-acq-blanket-orders.UNDO.sql b/KCLS/sql/schema/revert/blanket-po.sql similarity index 80% rename from KCLS/sql/jbas-654/jbas-654-acq-blanket-orders.UNDO.sql rename to KCLS/sql/schema/revert/blanket-po.sql index e9ae23efd7..a636e5d83b 100644 --- a/KCLS/sql/jbas-654/jbas-654-acq-blanket-orders.UNDO.sql +++ b/KCLS/sql/schema/revert/blanket-po.sql @@ -1,9 +1,11 @@ +-- Revert kcls-evergreen:blanket-po from pg + BEGIN; +DELETE FROM acq.invoice_item_type WHERE code = 'BLA'; + ALTER TABLE acq.invoice_item_type DROP CONSTRAINT aiit_not_blanket_and_prorate, DROP COLUMN blanket; -DELETE FROM acq.invoice_item_type WHERE code = 'BLA'; - COMMIT; diff --git a/KCLS/sql/schema/sqitch.plan b/KCLS/sql/schema/sqitch.plan index 06438fff76..d3cc4f7844 100644 --- a/KCLS/sql/schema/sqitch.plan +++ b/KCLS/sql/schema/sqitch.plan @@ -12,3 +12,4 @@ KMAIN_1729_Bug_from_KMAIN_268 [KMAIN_1448_Bug_from_KMAIN_268] 2015-08-12T19:01:3 KMAIN-1765-reingest-causing-false-browse-headings [02.collection-hq-items-2.5] 2015-08-12T21:45:43Z Joshua (JD) Drake # added test-data-mangle [KMAIN-1765-reingest-causing-false-browse-headings] 2015-08-14T20:36:56Z Bill Erickson # Check for wether to mangle data on deploy copy-stat-checkout-ok [test-data-mangle] 2015-08-14T20:47:19Z Bill Erickson # copy_status.checkout_ok flag for Grand Opening +blanket-po [copy-stat-checkout-ok] 2015-08-14T21:03:02Z Bill Erickson # Blanket PO diff --git a/KCLS/sql/schema/verify/blanket-po.sql b/KCLS/sql/schema/verify/blanket-po.sql new file mode 100644 index 0000000000..6197e656ce --- /dev/null +++ b/KCLS/sql/schema/verify/blanket-po.sql @@ -0,0 +1,7 @@ +-- Verify kcls-evergreen:blanket-po on pg + +BEGIN; + +SELECT blanket FROM acq.invoice_item_type WHERE FALSE; + +ROLLBACK; -- 2.11.0