From: Bill Erickson <berickxx@gmail.com>
Date: Tue, 4 Sep 2018 17:37:33 +0000 (-0400)
Subject: LP#1712854 Stamping DB upgrade for hold UIs sort/speed
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=4dbdd7bba989fe9826a2f28d07dfd5823c4e5e2d;p=evergreen%2Fequinox.git

LP#1712854 Stamping DB upgrade for hold UIs sort/speed

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 c2ace325b6..5fb343d022 100644
--- 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 ('1123', :eg_version); -- cesardv/berick/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1124', :eg_version); -- miker/kmlussier/berick
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/1124.data.wide_holds-workstation-settings.sql b/Open-ILS/src/sql/Pg/upgrade/1124.data.wide_holds-workstation-settings.sql
new file mode 100644
index 0000000000..d45c4d743a
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1124.data.wide_holds-workstation-settings.sql
@@ -0,0 +1,25 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1124', :eg_version);
+
+INSERT into config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+    'eg.grid.circ.wide_holds.shelf', 'gui', 'object',
+    oils_i18n_gettext (
+        'eg.grid.circ.wide_holds.shelf',
+        'Grid Config: circ.wide_holds.shelf',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.cat.catalog.wide_holds', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.cat.catalog.wide_holds',
+        'Grid Config: cat.catalog.wide_holds',
+        'cwst', 'label'
+    )
+);
+
+DELETE from config.workstation_setting_type
+WHERE name = 'eg.grid.cat.catalog.holds' OR name = 'eg.grid.circ.holds.shelf';
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.wide_holds-workstation-settings.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.wide_holds-workstation-settings.sql
deleted file mode 100644
index e693d68782..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.wide_holds-workstation-settings.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-BEGIN;
-
---SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
-INSERT into config.workstation_setting_type (name, grp, datatype, label)
-VALUES (
-    'eg.grid.circ.wide_holds.shelf', 'gui', 'object',
-    oils_i18n_gettext (
-        'eg.grid.circ.wide_holds.shelf',
-        'Grid Config: circ.wide_holds.shelf',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.cat.catalog.wide_holds', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.cat.catalog.wide_holds',
-        'Grid Config: cat.catalog.wide_holds',
-        'cwst', 'label'
-    )
-);
-
-DELETE from config.workstation_setting_type
-WHERE name = 'eg.grid.cat.catalog.holds' OR name = 'eg.grid.circ.holds.shelf';
-
-COMMIT;