JBAS-1132 (etc.) Avoid data inserts on new DB builds

Repair some Sqitch SQL scripts so they don't insert or verify on data
that should not exist yet.

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

diff --git a/KCLS/sql/schema/deploy/sip-activity-types.sql b/KCLS/sql/schema/deploy/sip-activity-types.sql
index 517e071..5b152db 100644 (file)
--- a/KCLS/sql/schema/deploy/sip-activity-types.sql
+++ b/KCLS/sql/schema/deploy/sip-activity-types.sql
@@ -3,13 +3,20 @@
 
 BEGIN;
 
-INSERT INTO config.usr_activity_type 
-    (ewho, ewhat, ehow, label, egroup, enabled, transient)
-VALUES
-    ('lyndasip', 'verify', 'sip2', 
-        'Lynda.com User Verification (via SIP)', 'authz', TRUE, FALSE),
-    ('hooplasip2', 'verify', 'sip2', 
-        'Hoopla User Verification (via SIP)', 'authz', TRUE, FALSE);
+-- Test inserted data if needed
+DO $$
+BEGIN
+    IF evergreen.insert_on_deploy() THEN
+        INSERT INTO config.usr_activity_type 
+            (ewho, ewhat, ehow, label, egroup, enabled, transient)
+        VALUES
+            ('lyndasip', 'verify', 'sip2', 
+                'Lynda.com User Verification (via SIP)', 'authz', TRUE, FALSE),
+            ('hooplasip2', 'verify', 'sip2', 
+                'Hoopla User Verification (via SIP)', 'authz', TRUE, FALSE);
+    END IF;
+
+END $$;
 
 COMMIT;
 

diff --git a/KCLS/sql/schema/verify/patron-self-reg-mods.sql b/KCLS/sql/schema/verify/patron-self-reg-mods.sql
index 9924852..96e9e3d 100644 (file)
--- a/KCLS/sql/schema/verify/patron-self-reg-mods.sql
+++ b/KCLS/sql/schema/verify/patron-self-reg-mods.sql
@@ -2,17 +2,16 @@
 
 BEGIN;
 
--- XXX Add verifications here.
-
-SELECT 1 / COUNT(*) FROM config.org_unit_setting_type 
-    WHERE name = 'opac.self_register.profile'; 
-
 SELECT ident_value2 FROM staging.user_stage LIMIT 1;
 
 -- Test inserted data if needed
 DO $$
 BEGIN
     IF evergreen.insert_on_deploy() THEN
+
+        PERFORM 1 / COUNT(*) FROM config.org_unit_setting_type 
+            WHERE name = 'opac.self_register.profile'; 
+
         PERFORM 1 / COUNT(*) FROM actor.org_unit_setting
             WHERE name = 'opac.self_register.profile';