From: Galen Charlton <gmc@equinoxinitiative.org>
Date: Thu, 25 May 2017 13:24:24 +0000 (-0400)
Subject: LP#1498155: stamp DB update
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=6d94067f076785499a1ffaf60dce193aa57f0a41;p=working%2FEvergreen.git

LP#1498155: stamp DB update

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>
---

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index c8f34197ac..f8091f09e3 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -90,7 +90,7 @@ CREATE TRIGGER no_overlapping_deps
     BEFORE INSERT OR UPDATE ON config.db_patch_dependencies
     FOR EACH ROW EXECUTE PROCEDURE evergreen.array_overlap_check ('deprecates');
 
-INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1040', :eg_version); --gmcharlt/berick
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1041', :eg_version); -- stompro/csharp/gmcharlt
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/1041.data.remove_SET_CIRC_MISSING.sql b/Open-ILS/src/sql/Pg/upgrade/1041.data.remove_SET_CIRC_MISSING.sql
new file mode 100644
index 0000000000..8113f89ee0
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1041.data.remove_SET_CIRC_MISSING.sql
@@ -0,0 +1,16 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1041', :eg_version); -- stompro/csharp/gmcharlt
+
+--delete all instances from permission.grp_perm_map first
+DELETE FROM permission.grp_perm_map where perm in 
+(select id from permission.perm_list where code='SET_CIRC_MISSING');
+
+--delete all instances from permission.usr_perm_map too
+DELETE FROM permission.usr_perm_map where perm in
+(select id from permission.perm_list where code='SET_CIRC_MISSING');
+
+--delete from permission.perm_list
+DELETE FROM permission.perm_list where code='SET_CIRC_MISSING';
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_SET_CIRC_MISSING.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_SET_CIRC_MISSING.sql
deleted file mode 100644
index faa2a6bbcd..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.remove_SET_CIRC_MISSING.sql
+++ /dev/null
@@ -1,14 +0,0 @@
-BEGIN;
-
---delete all instances from permission.grp_perm_map first
-DELETE FROM permission.grp_perm_map where perm in 
-(select id from permission.perm_list where code='SET_CIRC_MISSING');
-
---delete all instances from permission.usr_perm_map too
-DELETE FROM permission.usr_perm_map where perm in
-(select id from permission.perm_list where code='SET_CIRC_MISSING');
-
---delete from permission.perm_list
-DELETE FROM permission.perm_list where code='SET_CIRC_MISSING';
-
-COMMIT;