LP#1774277 Stamping upgrade for patron acq reqs

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 c7771c0..c80ab9c 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 ('1126', :eg_version); -- berick/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1127', :eg_version); -- phasefx/berick
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/1127.data.schema.acq.patron_requests.sql b/Open-ILS/src/sql/Pg/upgrade/1127.data.schema.acq.patron_requests.sql
new file mode 100644 (file)
index 0000000..936c31c
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1127.data.schema.acq.patron_requests.sql
@@ -0,0 +1,88 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1127', :eg_version);
+
+ALTER TABLE acq.user_request ADD COLUMN cancel_time TIMESTAMPTZ;
+ALTER TABLE acq.user_request ADD COLUMN upc TEXT;
+ALTER TABLE action.hold_request ADD COLUMN acq_request INT REFERENCES acq.user_request (id);
+
+UPDATE
+    config.org_unit_setting_type
+SET
+    label = oils_i18n_gettext(
+        'circ.holds.canceled.display_age',
+        'Canceled holds/requests display age',
+        'coust', 'label'),
+    description = oils_i18n_gettext(
+        'circ.holds.canceled.display_age',
+        'Show all canceled entries in patron holds and patron acquisition requests interfaces that were canceled within this amount of time',
+        'coust', 'description')
+WHERE
+    name = 'circ.holds.canceled.display_age'
+;
+
+UPDATE
+    config.org_unit_setting_type
+SET
+    label = oils_i18n_gettext(
+        'circ.holds.canceled.display_count',
+        'Canceled holds/requests display count',
+        'coust', 'label'),
+    description = oils_i18n_gettext(
+        'circ.holds.canceled.display_count',
+        'How many canceled entries to show in patron holds and patron acquisition requests interfaces',
+        'coust', 'description')
+WHERE
+    name = 'circ.holds.canceled.display_count'
+;
+
+INSERT INTO acq.cancel_reason (org_unit, keep_debits, id, label, description)
+    VALUES (
+        1, 'f', 1015,
+        oils_i18n_gettext(1015, 'Canceled: Fulfilled', 'acqcr', 'label'),
+        oils_i18n_gettext(1015, 'This acquisition request has been fulfilled.', 'acqcr', 'description')
+    )
+;
+
+UPDATE
+    acq.user_request_type
+SET
+    label = oils_i18n_gettext('2', 'Articles', 'aurt', 'label')
+WHERE
+    id = 2
+;
+
+INSERT INTO acq.user_request_type (id,label)
+    SELECT 6, oils_i18n_gettext('6', 'Other', 'aurt', 'label');
+
+SELECT SETVAL('acq.user_request_type_id_seq'::TEXT, (SELECT MAX(id)+1 FROM acq.user_request_type));
+
+INSERT INTO permission.perm_list ( id, code, description ) VALUES
+ ( 610, 'CLEAR_PURCHASE_REQUEST', oils_i18n_gettext(610,
+    'Clear Completed User Purchase Requests', 'ppl', 'description'))
+;
+
+CREATE TABLE acq.user_request_status_type (
+     id  SERIAL  PRIMARY KEY
+    ,label TEXT
+);
+
+INSERT INTO acq.user_request_status_type (id,label) VALUES
+     (0,oils_i18n_gettext(0,'Error','aurst','label'))
+    ,(1,oils_i18n_gettext(1,'New','aurst','label'))
+    ,(2,oils_i18n_gettext(2,'Pending','aurst','label'))
+    ,(3,oils_i18n_gettext(3,'Ordered, Hold Not Placed','aurst','label'))
+    ,(4,oils_i18n_gettext(4,'Ordered, Hold Placed','aurst','label'))
+    ,(5,oils_i18n_gettext(5,'Received','aurst','label'))
+    ,(6,oils_i18n_gettext(6,'Fulfilled','aurst','label'))
+    ,(7,oils_i18n_gettext(7,'Canceled','aurst','label'))
+;
+
+SELECT SETVAL('acq.user_request_status_type_id_seq'::TEXT, 100);
+
+-- not used
+DELETE FROM actor.org_unit_setting WHERE name = 'acq.holds.allow_holds_from_purchase_request';
+DELETE FROM config.org_unit_setting_type_log WHERE field_name = 'acq.holds.allow_holds_from_purchase_request';
+DELETE FROM config.org_unit_setting_type WHERE name = 'acq.holds.allow_holds_from_purchase_request';
+
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.schema.acq.patron_requests.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.schema.acq.patron_requests.sql
deleted file mode 100644 (file)
index 5035008..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.schema.acq.patron_requests.sql
+++ /dev/null
@@ -1,88 +0,0 @@
-BEGIN;
-
---SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
-ALTER TABLE acq.user_request ADD COLUMN cancel_time TIMESTAMPTZ;
-ALTER TABLE acq.user_request ADD COLUMN upc TEXT;
-ALTER TABLE action.hold_request ADD COLUMN acq_request INT REFERENCES acq.user_request (id);
-
-UPDATE
-    config.org_unit_setting_type
-SET
-    label = oils_i18n_gettext(
-        'circ.holds.canceled.display_age',
-        'Canceled holds/requests display age',
-        'coust', 'label'),
-    description = oils_i18n_gettext(
-        'circ.holds.canceled.display_age',
-        'Show all canceled entries in patron holds and patron acquisition requests interfaces that were canceled within this amount of time',
-        'coust', 'description')
-WHERE
-    name = 'circ.holds.canceled.display_age'
-;
-
-UPDATE
-    config.org_unit_setting_type
-SET
-    label = oils_i18n_gettext(
-        'circ.holds.canceled.display_count',
-        'Canceled holds/requests display count',
-        'coust', 'label'),
-    description = oils_i18n_gettext(
-        'circ.holds.canceled.display_count',
-        'How many canceled entries to show in patron holds and patron acquisition requests interfaces',
-        'coust', 'description')
-WHERE
-    name = 'circ.holds.canceled.display_count'
-;
-
-INSERT INTO acq.cancel_reason (org_unit, keep_debits, id, label, description)
-    VALUES (
-        1, 'f', 1015,
-        oils_i18n_gettext(1015, 'Canceled: Fulfilled', 'acqcr', 'label'),
-        oils_i18n_gettext(1015, 'This acquisition request has been fulfilled.', 'acqcr', 'description')
-    )
-;
-
-UPDATE
-    acq.user_request_type
-SET
-    label = oils_i18n_gettext('2', 'Articles', 'aurt', 'label')
-WHERE
-    id = 2
-;
-
-INSERT INTO acq.user_request_type (id,label)
-    SELECT 6, oils_i18n_gettext('6', 'Other', 'aurt', 'label');
-
-SELECT SETVAL('acq.user_request_type_id_seq'::TEXT, (SELECT MAX(id)+1 FROM acq.user_request_type));
-
-INSERT INTO permission.perm_list ( id, code, description ) VALUES
- ( 610, 'CLEAR_PURCHASE_REQUEST', oils_i18n_gettext(610,
-    'Clear Completed User Purchase Requests', 'ppl', 'description'))
-;
-
-CREATE TABLE acq.user_request_status_type (
-     id  SERIAL  PRIMARY KEY
-    ,label TEXT
-);
-
-INSERT INTO acq.user_request_status_type (id,label) VALUES
-     (0,oils_i18n_gettext(0,'Error','aurst','label'))
-    ,(1,oils_i18n_gettext(1,'New','aurst','label'))
-    ,(2,oils_i18n_gettext(2,'Pending','aurst','label'))
-    ,(3,oils_i18n_gettext(3,'Ordered, Hold Not Placed','aurst','label'))
-    ,(4,oils_i18n_gettext(4,'Ordered, Hold Placed','aurst','label'))
-    ,(5,oils_i18n_gettext(5,'Received','aurst','label'))
-    ,(6,oils_i18n_gettext(6,'Fulfilled','aurst','label'))
-    ,(7,oils_i18n_gettext(7,'Canceled','aurst','label'))
-;
-
-SELECT SETVAL('acq.user_request_status_type_id_seq'::TEXT, 100);
-
--- not used
-DELETE FROM actor.org_unit_setting WHERE name = 'acq.holds.allow_holds_from_purchase_request';
-DELETE FROM config.org_unit_setting_type_log WHERE field_name = 'acq.holds.allow_holds_from_purchase_request';
-DELETE FROM config.org_unit_setting_type WHERE name = 'acq.holds.allow_holds_from_purchase_request';
-
-COMMIT;