JBAS-837 Rename data insert test for clarity

Rename deployment test function evergreen.mangle_data_on_deploy()
to evergreen.insert_in_deploy() to better reflect its behavior.

The test only needs to be used before INSERT's.

Signed-off-by: Bill Erickson <berickxx@gmail.com>

diff --git a/KCLS/sql/schema/deploy/blanket-po.sql b/KCLS/sql/schema/deploy/blanket-po.sql
index 1d8ee82..ebbb9cd 100644 (file)
--- a/KCLS/sql/schema/deploy/blanket-po.sql
+++ b/KCLS/sql/schema/deploy/blanket-po.sql
@@ -10,7 +10,7 @@ ALTER TABLE acq.invoice_item_type
 
 DO $$
 BEGIN
-    IF evergreen.mangle_data_on_deploy() THEN
+    IF evergreen.insert_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;

diff --git a/KCLS/sql/schema/deploy/insert-on-deploy.sql b/KCLS/sql/schema/deploy/insert-on-deploy.sql
new file mode 100644 (file)
index 0000000..6e94c7d
--- /dev/null
+++ b/KCLS/sql/schema/deploy/insert-on-deploy.sql
@@ -0,0 +1,15 @@
+-- Deploy kcls-evergreen:insert-on-deploy to pg
+-- requires: KMAIN-1765-reingest-causing-false-browse-headings
+
+BEGIN;
+
+-- Returns true if at least one org unit is in the DB.
+-- This is our indication that deployment scripts should
+-- continue inserting new data.  If no org unit is preset,
+-- we assume this is a schema-only deployment.
+CREATE OR REPLACE FUNCTION 
+    evergreen.insert_on_deploy() RETURNS BOOLEAN AS $$
+    SELECT EXISTS(SELECT id FROM actor.org_unit LIMIT 1);
+$$ LANGUAGE SQL;
+
+COMMIT;

diff --git a/KCLS/sql/schema/deploy/test-data-mangle.sql b/KCLS/sql/schema/deploy/test-data-mangle.sql
deleted file mode 100644 (file)
index a597758..0000000
--- a/KCLS/sql/schema/deploy/test-data-mangle.sql
+++ /dev/null
@@ -1,14 +0,0 @@
--- Deploy kcls-evergreen:test-data-mangle to pg
--- requires: KMAIN-1765-reingest-causing-false-browse-headings
-
-BEGIN;
-
--- Teturns true if at least one org unit is in the DB
--- This is our indication that deployment scripts should
--- mangle (insert,update,delete) data.
-CREATE OR REPLACE FUNCTION 
-    evergreen.mangle_data_on_deploy() RETURNS BOOLEAN AS $$
-    SELECT EXISTS(SELECT id FROM actor.org_unit LIMIT 1);
-$$ LANGUAGE SQL;
-
-COMMIT;

diff --git a/KCLS/sql/schema/revert/insert-on-deploy.sql b/KCLS/sql/schema/revert/insert-on-deploy.sql
new file mode 100644 (file)
index 0000000..a6b52c7
--- /dev/null
+++ b/KCLS/sql/schema/revert/insert-on-deploy.sql
@@ -0,0 +1,7 @@
+-- Revert kcls-evergreen:insert-on-deploy from pg
+
+BEGIN;
+
+DROP FUNCTION evergreen.insert_on_deploy();
+
+COMMIT;

diff --git a/KCLS/sql/schema/revert/test-data-mangle.sql b/KCLS/sql/schema/revert/test-data-mangle.sql
deleted file mode 100644 (file)
index 0c1db80..0000000
--- a/KCLS/sql/schema/revert/test-data-mangle.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- Revert kcls-evergreen:test-data-mangle from pg
-
-BEGIN;
-
-DROP FUNCTION evergreen.mangle_data_on_deploy();
-
-COMMIT;

diff --git a/KCLS/sql/schema/sqitch.plan b/KCLS/sql/schema/sqitch.plan
index d3cc4f7..24dda80 100644 (file)
--- a/KCLS/sql/schema/sqitch.plan
+++ b/KCLS/sql/schema/sqitch.plan
@@ -10,6 +10,6 @@ KMAIN_1729_Bug_from_KMAIN_268 [KMAIN_1448_Bug_from_KMAIN_268] 2015-08-12T19:01:3
 
 02.collection-hq-items-2.5 [01.2.4.1-2.5.7-upgrade] 2015-08-12T21:42:53Z Joshua (JD) Drake <jd@commandprompt.com> # added
 KMAIN-1765-reingest-causing-false-browse-headings [02.collection-hq-items-2.5] 2015-08-12T21:45:43Z Joshua (JD) Drake <jd@commandprompt.com> # added
-test-data-mangle [KMAIN-1765-reingest-causing-false-browse-headings] 2015-08-14T20:36:56Z Bill Erickson  <berickxx@gmail.com > # Check for wether to mangle data on deploy
-copy-stat-checkout-ok [test-data-mangle] 2015-08-14T20:47:19Z Bill Erickson  <berickxx@gmail.com > # copy_status.checkout_ok flag for Grand Opening
+insert-on-deploy [KMAIN-1765-reingest-causing-false-browse-headings] 2015-08-14T20:36:56Z Bill Erickson  <berickxx@gmail.com > # Check for wether to insert data on deploy
+copy-stat-checkout-ok [insert-on-deploy] 2015-08-14T20:47:19Z Bill Erickson  <berickxx@gmail.com > # copy_status.checkout_ok flag for Grand Opening
 blanket-po [copy-stat-checkout-ok] 2015-08-14T21:03:02Z Bill Erickson  <berickxx@gmail.com > # Blanket PO

diff --git a/KCLS/sql/schema/verify/insert-on-deploy.sql b/KCLS/sql/schema/verify/insert-on-deploy.sql
new file mode 100644 (file)
index 0000000..aa1dc1d
--- /dev/null
+++ b/KCLS/sql/schema/verify/insert-on-deploy.sql
@@ -0,0 +1,7 @@
+-- Verify kcls-evergreen:insert-on-deploy on pg
+
+BEGIN;
+
+SELECT has_function_privilege('evergreen.insert_on_deploy()', 'execute');
+
+ROLLBACK;

diff --git a/KCLS/sql/schema/verify/test-data-mangle.sql b/KCLS/sql/schema/verify/test-data-mangle.sql
deleted file mode 100644 (file)
index 1c80c3a..0000000
--- a/KCLS/sql/schema/verify/test-data-mangle.sql
+++ /dev/null
@@ -1,7 +0,0 @@
--- Verify kcls-evergreen:test-data-mangle on pg
-
-BEGIN;
-
-SELECT has_function_privilege('evergreen.mangle_data_on_deploy()', 'execute');
-
-ROLLBACK;