From: Dan Scott <dscott@laurentian.ca>
Date: Wed, 1 Aug 2012 21:33:48 +0000 (-0400)
Subject: Wrap upgrade script for search filter group admin UI
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=abc738f57e52871192f9a027e5356deb8f7424d5;p=evergreen%2Fmasslnc.git

Wrap upgrade script for search filter group admin UI

Signed-off-by: Dan Scott <dscott@laurentian.ca>
---

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index b836f97114..4c57bb6c6b 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -87,7 +87,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 ('0734', :eg_version); -- tsbere/denials
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0735', :eg_version); -- berick/kmlussier/denials
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/0735.data.search_filter_group_perms.sql b/Open-ILS/src/sql/Pg/upgrade/0735.data.search_filter_group_perms.sql
new file mode 100644
index 0000000000..cdcf50a96f
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0735.data.search_filter_group_perms.sql
@@ -0,0 +1,31 @@
+-- Evergreen DB patch 0735.data.search_filter_group_perms.sql
+--
+BEGIN;
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0735', :eg_version);
+
+INSERT INTO permission.perm_list ( id, code, description ) 
+    VALUES ( 
+        537, 
+        'ADMIN_SEARCH_FILTER_GROUP',
+        oils_i18n_gettext( 
+            537,
+            'Allows staff to manage search filter groups and entries',
+            'ppl', 
+            'description' 
+        )
+    ),
+    (
+        538, 
+        'VIEW_SEARCH_FILTER_GROUP',
+        oils_i18n_gettext( 
+            538,
+            'Allows staff to view search filter groups and entries',
+            'ppl', 
+            'description' 
+        )
+
+    );
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.search_filter_group_perms.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.search_filter_group_perms.sql
deleted file mode 100644
index a0310e9c8b..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.search_filter_group_perms.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-BEGIN;
-
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
--- TODO: verify IDs before merging
-INSERT INTO permission.perm_list ( id, code, description ) 
-    VALUES ( 
-        537, 
-        'ADMIN_SEARCH_FILTER_GROUP',
-        oils_i18n_gettext( 
-            537,
-            'Allows staff to manage search filter groups and entries',
-            'ppl', 
-            'description' 
-        )
-    ),
-    (
-        538, 
-        'VIEW_SEARCH_FILTER_GROUP',
-        oils_i18n_gettext( 
-            538,
-            'Allows staff to view search filter groups and entries',
-            'ppl', 
-            'description' 
-        )
-
-    );
-
-COMMIT;