LP#1816475: stamp DB updates

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 12db6e1..0d56784 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 ('1175', :eg_version); -- gmcharlt/berick/miker/sandbergja
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1177', :eg_version); -- sandberja/cburns/gmcharlt
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/1176.schema.add_note_bresv.sql b/Open-ILS/src/sql/Pg/upgrade/1176.schema.add_note_bresv.sql
new file mode 100644 (file)
index 0000000..a6e84ed
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1176.schema.add_note_bresv.sql
@@ -0,0 +1,8 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1176', :eg_version);
+
+ALTER TABLE booking.reservation
+    ADD COLUMN note TEXT;
+
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/1177.data.booking-sticky-settings.sql b/Open-ILS/src/sql/Pg/upgrade/1177.data.booking-sticky-settings.sql
new file mode 100644 (file)
index 0000000..55622d3
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1177.data.booking-sticky-settings.sql
@@ -0,0 +1,80 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1177', :eg_version);
+
+INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+    'eg.grid.booking.manage', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.manage',
+        'Grid Config: Booking Manage Reservations',
+        'cwst', 'label')
+), (
+    'eg.grid.booking.pickup.ready', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.pickup.ready',
+        'Grid Config: Booking Ready to pick up grid',
+        'cwst', 'label')
+), (
+    'eg.grid.booking.pickup.picked_up', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.pickup.picked_up',
+        'Grid Config: Booking Already Picked Up grid',
+        'cwst', 'label')
+), (
+    'eg.grid.booking.return.patron.picked_up', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.return.patron.picked_up',
+        'Grid Config: Booking Return Patron tab Already Picked Up grid',
+        'cwst', 'label')
+), (
+    'eg.grid.booking.return.patron.returned', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.return.patron.returned',
+        'Grid Config: Booking Return Patron tab Returned Today grid',
+        'cwst', 'label')
+), (
+    'eg.grid.booking.return.resource.picked_up', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.return.resourcce.picked_up',
+        'Grid Config: Booking Return Resource tab Already Picked Up grid',
+        'cwst', 'label')
+), (
+    'eg.grid.booking.return.resource.returned', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.return.resource.returned',
+        'Grid Config: Booking Return Resource tab Returned Today grid',
+        'cwst', 'label')
+), (
+    'eg.booking.manage.selected_org_family', 'gui', 'object',
+    oils_i18n_gettext(
+        'booking.manage.selected_org_family',
+        'Sticky setting for pickup ou family in Manage Reservations screen',
+        'cwst', 'label')
+), (
+    'eg.booking.return.tab', 'gui', 'string',
+    oils_i18n_gettext(
+        'booking.return.tab',
+        'Sticky setting for tab in Booking Return',
+        'cwst', 'label')
+), (
+    'eg.booking.create.granularity', 'gui', 'integer',
+    oils_i18n_gettext(
+        'booking.create.granularity',
+        'Sticky setting for granularity combobox in Booking Create',
+        'cwst', 'label')
+), (
+    'eg.booking.create.multiday', 'gui', 'bool',
+    oils_i18n_gettext(
+        'booking.create.multiday',
+        'Default to creating multiday booking reservations',
+        'cwst', 'label')
+), (
+    'eg.booking.pickup.ready.only_show_captured', 'gui', 'bool',
+    oils_i18n_gettext(
+        'booking.pickup.ready.only_show_captured',
+        'Include only resources that have been captured in the Ready grid in the Pickup screen',
+        'cwst', 'label')
+);
+
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.booking-sticky-settings.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.booking-sticky-settings.sql
deleted file mode 100644 (file)
index 8da02ed..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.booking-sticky-settings.sql
+++ /dev/null
@@ -1,78 +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.booking.manage', 'gui', 'object',
-    oils_i18n_gettext(
-        'booking.manage',
-        'Grid Config: Booking Manage Reservations',
-        'cwst', 'label')
-), (
-    'eg.grid.booking.pickup.ready', 'gui', 'object',
-    oils_i18n_gettext(
-        'booking.pickup.ready',
-        'Grid Config: Booking Ready to pick up grid',
-        'cwst', 'label')
-), (
-    'eg.grid.booking.pickup.picked_up', 'gui', 'object',
-    oils_i18n_gettext(
-        'booking.pickup.picked_up',
-        'Grid Config: Booking Already Picked Up grid',
-        'cwst', 'label')
-), (
-    'eg.grid.booking.return.patron.picked_up', 'gui', 'object',
-    oils_i18n_gettext(
-        'booking.return.patron.picked_up',
-        'Grid Config: Booking Return Patron tab Already Picked Up grid',
-        'cwst', 'label')
-), (
-    'eg.grid.booking.return.patron.returned', 'gui', 'object',
-    oils_i18n_gettext(
-        'booking.return.patron.returned',
-        'Grid Config: Booking Return Patron tab Returned Today grid',
-        'cwst', 'label')
-), (
-    'eg.grid.booking.return.resource.picked_up', 'gui', 'object',
-    oils_i18n_gettext(
-        'booking.return.resourcce.picked_up',
-        'Grid Config: Booking Return Resource tab Already Picked Up grid',
-        'cwst', 'label')
-), (
-    'eg.grid.booking.return.resource.returned', 'gui', 'object',
-    oils_i18n_gettext(
-        'booking.return.resource.returned',
-        'Grid Config: Booking Return Resource tab Returned Today grid',
-        'cwst', 'label')
-), (
-    'eg.booking.manage.selected_org_family', 'gui', 'object',
-    oils_i18n_gettext(
-        'booking.manage.selected_org_family',
-        'Sticky setting for pickup ou family in Manage Reservations screen',
-        'cwst', 'label')
-), (
-    'eg.booking.return.tab', 'gui', 'string',
-    oils_i18n_gettext(
-        'booking.return.tab',
-        'Sticky setting for tab in Booking Return',
-        'cwst', 'label')
-), (
-    'eg.booking.create.granularity', 'gui', 'integer',
-    oils_i18n_gettext(
-        'booking.create.granularity',
-        'Sticky setting for granularity combobox in Booking Create',
-        'cwst', 'label')
-), (
-    'eg.booking.create.multiday', 'gui', 'bool',
-    oils_i18n_gettext(
-        'booking.create.multiday',
-        'Default to creating multiday booking reservations',
-        'cwst', 'label')
-), (
-    'eg.booking.pickup.ready.only_show_captured', 'gui', 'bool',
-    oils_i18n_gettext(
-        'booking.pickup.ready.only_show_captured',
-        'Include only resources that have been captured in the Ready grid in the Pickup screen',
-        'cwst', 'label')
-);
-
-COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.add_note_bresv.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.add_note_bresv.sql
deleted file mode 100644 (file)
index 4742f1d..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.add_note_bresv.sql
+++ /dev/null
@@ -1,6 +0,0 @@
-BEGIN;
-
-ALTER TABLE booking.reservation
-    ADD COLUMN note TEXT;
-
-COMMIT;