From: Jason Stephenson <jstephenson@mvlc.org>
Date: Tue, 8 Oct 2013 18:58:37 +0000 (-0400)
Subject: Wrap upgrade script for 0840 circulation column picker.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=741c1140d76f5d604d9926bcbc52662173ca1b3b;p=evergreen%2Fmasslnc.git

Wrap upgrade script for 0840 circulation column picker.

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
---

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 28685a1e8f..6f689224b4 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,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 ('0839', :eg_version); -- eeevil/senator/dbwells
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0840', :eg_version); -- gcollum/dyrcona
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/0840.data.circulation-policy-configuration.sql b/Open-ILS/src/sql/Pg/upgrade/0840.data.circulation-policy-configuration.sql
new file mode 100644
index 0000000000..50c41feffd
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0840.data.circulation-policy-configuration.sql
@@ -0,0 +1,24 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0840', :eg_version);
+
+INSERT INTO config.usr_setting_type (name,grp,opac_visible,label,description,datatype) VALUES (
+    'ui.grid_columns.conify.config.circ_matrix_matchpoint',
+    'gui',
+    FALSE,
+    oils_i18n_gettext(
+        'ui.grid_columns.conify.config.circ_matrix_matchpoint',
+        'Circulation Policy Configuration',
+        'cust',
+        'label'
+    ),
+    oils_i18n_gettext(
+        'ui.grid_columns.conify.config.circ_matrix_matchpoint',
+        'Circulation Policy Configuration Column Settings',
+        'cust',
+        'description'
+    ),
+    'string'
+);
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.circulation-policy-configuration.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.circulation-policy-configuration.sql
deleted file mode 100644
index 81b91bb71a..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.circulation-policy-configuration.sql
+++ /dev/null
@@ -1,24 +0,0 @@
-BEGIN;
-
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
-INSERT INTO config.usr_setting_type (name,grp,opac_visible,label,description,datatype) VALUES (
-    'ui.grid_columns.conify.config.circ_matrix_matchpoint',
-    'gui',
-    FALSE,
-    oils_i18n_gettext(
-        'ui.grid_columns.conify.config.circ_matrix_matchpoint',
-        'Circulation Policy Configuration',
-        'cust',
-        'label'
-    ),
-    oils_i18n_gettext(
-        'ui.grid_columns.conify.config.circ_matrix_matchpoint',
-        'Circulation Policy Configuration Column Settings',
-        'cust',
-        'description'
-    ),
-    'string'
-);
-
-COMMIT;