gave upgrade script a real version number

Signed-off-by: Bill Erickson <berick@esilibrary.com>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 56af82f..8f107d1 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -86,7 +86,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 ('0543', :eg_version); -- dbwells
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0544', :eg_version); -- berick
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/0543.data.reformat_generated_coverage.sql b/Open-ILS/src/sql/Pg/upgrade/0543.data.reformat_generated_coverage.sql
deleted file mode 100644 (file)
index 25fcb9f..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/0543.data.reformat_generated_coverage.sql
+++ /dev/null
@@ -1,18 +0,0 @@
-BEGIN;
-
--- Reformat generated_coverage to be JSON arrays rather than simple comma-
--- separated lists.
-
--- This upgrade script is technically imperfect, but should do the right thing
--- in 99.9% of cases, and any mistakes will be self-healing as more serials
--- activity happens
-
-SELECT evergreen.upgrade_deps_block_check('0543', :eg_version); -- dbwells
-
-UPDATE serial.basic_summary SET generated_coverage = '["' || regexp_replace(regexp_replace(generated_coverage, '"', E'\\"', 'g'), ', ', '","', 'g') || '"]' WHERE generated_coverage <> '';
-
-UPDATE serial.supplement_summary SET generated_coverage = '["' || regexp_replace(regexp_replace(generated_coverage, '"', E'\\"', 'g'), ', ', '","', 'g') || '"]' WHERE generated_coverage <> '';
-
-UPDATE serial.index_summary SET generated_coverage = '["' || regexp_replace(regexp_replace(generated_coverage, '"', E'\\"', 'g'), ', ', '","', 'g') || '"]' WHERE generated_coverage <> '';
-
-COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/0544..data.patron_no_collections.sql b/Open-ILS/src/sql/Pg/upgrade/0544..data.patron_no_collections.sql
new file mode 100644 (file)
index 0000000..25fcb9f
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0544..data.patron_no_collections.sql
@@ -0,0 +1,18 @@
+BEGIN;
+
+-- Reformat generated_coverage to be JSON arrays rather than simple comma-
+-- separated lists.
+
+-- This upgrade script is technically imperfect, but should do the right thing
+-- in 99.9% of cases, and any mistakes will be self-healing as more serials
+-- activity happens
+
+SELECT evergreen.upgrade_deps_block_check('0543', :eg_version); -- dbwells
+
+UPDATE serial.basic_summary SET generated_coverage = '["' || regexp_replace(regexp_replace(generated_coverage, '"', E'\\"', 'g'), ', ', '","', 'g') || '"]' WHERE generated_coverage <> '';
+
+UPDATE serial.supplement_summary SET generated_coverage = '["' || regexp_replace(regexp_replace(generated_coverage, '"', E'\\"', 'g'), ', ', '","', 'g') || '"]' WHERE generated_coverage <> '';
+
+UPDATE serial.index_summary SET generated_coverage = '["' || regexp_replace(regexp_replace(generated_coverage, '"', E'\\"', 'g'), ', ', '","', 'g') || '"]' WHERE generated_coverage <> '';
+
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.patron_no_collections.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.patron_no_collections.sql
index 620c2a4..74ce619 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.patron_no_collections.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.patron_no_collections.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-INSERT INTO config.upgrade_log (version) VALUES ('XXX');
+SELECT evergreen.upgrade_deps_block_check('0544', :eg_version); 
 
 INSERT INTO config.usr_setting_type 
 ( name, opac_visible, label, description, datatype) VALUES