LP#1857150: stamp schema update

Signed-off-by: Jason Etheridge <jason@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 d2e09d2..ae99152 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 ('1224', :eg_version); -- rhamby/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1226', :eg_version); -- phasefx/gmcharlt
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/AAAA.schema.provider-primary-contact.sql b/Open-ILS/src/sql/Pg/upgrade/1225.schema.provider-primary-contact.sql
similarity index 80%
rename from Open-ILS/src/sql/Pg/upgrade/AAAA.schema.provider-primary-contact.sql
rename to Open-ILS/src/sql/Pg/upgrade/1225.schema.provider-primary-contact.sql
index b95f456..43fcd62 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/AAAA.schema.provider-primary-contact.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1225.schema.provider-primary-contact.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1225', :eg_version);
 
 ALTER TABLE acq.provider ADD COLUMN primary_contact INT;
 ALTER TABLE acq.provider ADD CONSTRAINT acq_provider_primary_contact_fkey FOREIGN KEY (primary_contact) REFERENCES acq.provider_contact (id) ON DELETE SET NULL ON UPDATE CASCADE DEFERRABLE INITIALLY DEFERRED;

diff --git a/Open-ILS/src/sql/Pg/upgrade/ZZZZ.data.angular-providers.sql b/Open-ILS/src/sql/Pg/upgrade/1226.data.angular-providers.sql
similarity index 96%
rename from Open-ILS/src/sql/Pg/upgrade/ZZZZ.data.angular-providers.sql
rename to Open-ILS/src/sql/Pg/upgrade/1226.data.angular-providers.sql
index cedae0a..e126977 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/ZZZZ.data.angular-providers.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1226.data.angular-providers.sql
@@ -1,5 +1,7 @@
 BEGIN;
 
+SELECT evergreen.upgrade_deps_block_check('1226', :eg_version);
+
 INSERT INTO config.workstation_setting_type
     (name, grp, datatype, label)
 VALUES (