From: Bill Erickson <berickxx@gmail.com>
Date: Fri, 25 Jan 2019 17:10:14 +0000 (-0500)
Subject: LP1809288 Stamping SQL upgrade for booking admin
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=7ae23c6e8dd126f525a1eae9b5f936274618760f;p=working%2FEvergreen.git

LP1809288 Stamping SQL upgrade for booking admin

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 0eefd040dc..c9685b5380 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 ('1142', :eg_version); -- csharp/bshum
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1143', :eg_version); -- sandbergja/berick
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/1143.data.booking-admin-grid-settings.sql b/Open-ILS/src/sql/Pg/upgrade/1143.data.booking-admin-grid-settings.sql
new file mode 100644
index 0000000000..273d83e8a1
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1143.data.booking-admin-grid-settings.sql
@@ -0,0 +1,43 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1143', :eg_version);
+
+INSERT into config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+    'eg.grid.admin.booking.resource', 'gui', 'object',
+    oils_i18n_gettext (
+        'eg.grid.admin.booking.resource',
+        'Grid Config: admin.booking.resource',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.booking.resource_attr', 'gui', 'object',
+    oils_i18n_gettext (
+    'eg.grid.admin.booking.resource_attr',
+        'Grid Config: admin.booking.resource_attr',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.booking.resource_attr_map', 'gui', 'object',
+    oils_i18n_gettext (
+    'eg.grid.admin.booking.resource_attr_map',
+        'Grid Config: admin.booking.resource_attr_map',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.booking.resource_attr_value', 'gui', 'object',
+    oils_i18n_gettext (
+    'eg.grid.admin.booking.resource_attr_value',
+        'Grid Config: admin.booking.resource_attr_value',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.booking.resource_type', 'gui', 'object',
+    oils_i18n_gettext (
+    'eg.grid.admin.booking.resource_type',
+        'Grid Config: admin.booking.resource_type',
+        'cwst', 'label'
+    )
+);
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.booking-admin-grid-settings.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.booking-admin-grid-settings.sql
deleted file mode 100644
index aad27076dc..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.booking-admin-grid-settings.sql
+++ /dev/null
@@ -1,43 +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.admin.booking.resource', 'gui', 'object',
-    oils_i18n_gettext (
-        'eg.grid.admin.booking.resource',
-        'Grid Config: admin.booking.resource',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.booking.resource_attr', 'gui', 'object',
-    oils_i18n_gettext (
-    'eg.grid.admin.booking.resource_attr',
-        'Grid Config: admin.booking.resource_attr',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.booking.resource_attr_map', 'gui', 'object',
-    oils_i18n_gettext (
-    'eg.grid.admin.booking.resource_attr_map',
-        'Grid Config: admin.booking.resource_attr_map',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.booking.resource_attr_value', 'gui', 'object',
-    oils_i18n_gettext (
-    'eg.grid.admin.booking.resource_attr_value',
-        'Grid Config: admin.booking.resource_attr_value',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.booking.resource_type', 'gui', 'object',
-    oils_i18n_gettext (
-    'eg.grid.admin.booking.resource_type',
-        'Grid Config: admin.booking.resource_type',
-        'cwst', 'label'
-    )
-);
-
-COMMIT;