LP1891960 Stamping upgrade: patron search sticky org

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

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 9436263..ac3b514 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,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 ('1215', :eg_version); -- berick/tmcanna/sandbergja
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1216', :eg_version); -- berick/sandbergja
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/1216.data.patron-search-org-select.sql b/Open-ILS/src/sql/Pg/upgrade/1216.data.patron-search-org-select.sql
new file mode 100644 (file)
index 0000000..af063e3
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1216.data.patron-search-org-select.sql
@@ -0,0 +1,17 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1216', :eg_version);
+
+INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+    'eg.orgselect.patron.search', 'gui', 'integer',
+    oils_i18n_gettext(
+        'eg.orgselect.patron.search',
+        'Default org unit for patron search',
+        'cwst', 'label'
+    )
+);
+
+COMMIT;
+
+

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.patron-search-org-select.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.patron-search-org-select.sql
deleted file mode 100644 (file)
index 2e6e3a9..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.patron-search-org-select.sql
+++ /dev/null
@@ -1,17 +0,0 @@
-BEGIN;
-
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
-INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
-VALUES (
-    'eg.orgselect.patron.search', 'gui', 'integer',
-    oils_i18n_gettext(
-        'eg.orgselect.patron.search',
-        'Default org unit for patron search',
-        'cwst', 'label'
-    )
-);
-
-COMMIT;
-
-