LP#1612752: stamp schema update

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 b19894a..df2bb56 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -90,7 +90,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 ('1044', :eg_version); -- berick/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1045', :eg_version); -- csharp/berick/gmcharlt
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/1045.schema.create-transit-cancel-time-column.sql b/Open-ILS/src/sql/Pg/upgrade/1045.schema.create-transit-cancel-time-column.sql
new file mode 100644 (file)
index 0000000..b4ae8ff
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1045.schema.create-transit-cancel-time-column.sql
@@ -0,0 +1,25 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1045', :eg_version); -- csharp/berick/gmcharlt
+
+ALTER TABLE action.transit_copy
+       ADD COLUMN cancel_time TIMESTAMPTZ;
+
+-- change "abort" to "cancel" in stock perm descriptions
+UPDATE permission.perm_list 
+       SET description = 'Allow a user to cancel a copy transit if the user is at the transit destination or source' 
+       WHERE code = 'ABORT_TRANSIT'
+       AND description = 'Allow a user to abort a copy transit if the user is at the transit destination or source';
+UPDATE permission.perm_list 
+       SET description = 'Allow a user to cancel a copy transit if the user is not at the transit source or dest' 
+       WHERE code = 'ABORT_REMOTE_TRANSIT'
+       AND description = 'Allow a user to abort a copy transit if the user is not at the transit source or dest';
+UPDATE permission.perm_list 
+       SET description = 'Allows a user to cancel a transit on a copy with status of LOST' 
+       WHERE code = 'ABORT_TRANSIT_ON_LOST'
+       AND description = 'Allows a user to abort a transit on a copy with status of LOST';
+UPDATE permission.perm_list 
+       SET description = 'Allows a user to cancel a transit on a copy with status of MISSING' 
+       WHERE code = 'ABORT_TRANSIT_ON_MISSING'
+       AND description = 'Allows a user to abort a transit on a copy with status of MISSING';
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX-create-transit-cancel-time-column.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX-create-transit-cancel-time-column.sql
deleted file mode 100644 (file)
index 57766f5..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX-create-transit-cancel-time-column.sql
+++ /dev/null
@@ -1,25 +0,0 @@
-BEGIN;
-
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
-ALTER TABLE action.transit_copy
-       ADD COLUMN cancel_time TIMESTAMPTZ;
-
--- change "abort" to "cancel" in stock perm descriptions
-UPDATE permission.perm_list 
-       SET description = 'Allow a user to cancel a copy transit if the user is at the transit destination or source' 
-       WHERE code = 'ABORT_TRANSIT'
-       AND description = 'Allow a user to abort a copy transit if the user is at the transit destination or source';
-UPDATE permission.perm_list 
-       SET description = 'Allow a user to cancel a copy transit if the user is not at the transit source or dest' 
-       WHERE code = 'ABORT_REMOTE_TRANSIT'
-       AND description = 'Allow a user to abort a copy transit if the user is not at the transit source or dest';
-UPDATE permission.perm_list 
-       SET description = 'Allows a user to cancel a transit on a copy with status of LOST' 
-       WHERE code = 'ABORT_TRANSIT_ON_LOST'
-       AND description = 'Allows a user to abort a transit on a copy with status of LOST';
-UPDATE permission.perm_list 
-       SET description = 'Allows a user to cancel a transit on a copy with status of MISSING' 
-       WHERE code = 'ABORT_TRANSIT_ON_MISSING'
-       AND description = 'Allows a user to abort a transit on a copy with status of MISSING';
-COMMIT;