Changing the rules for database upgrades: config.upgrade_log.version

will henceforth be all-numeric.

git-svn-id: svn://svn.open-ils.org/ILS/trunk@14095 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/src/sql/Pg/upgrade/0001.data.config.org_unit_setting_type.sql b/Open-ILS/src/sql/Pg/upgrade/0001.data.config.org_unit_setting_type.sql
index 395d525..9629d65 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0001.data.config.org_unit_setting_type.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0001.data.config.org_unit_setting_type.sql
@@ -2,7 +2,7 @@ BEGIN;
 
 -- Org Unit Settings for configuring org unit weights and org unit max-loops for hold targeting
 
-INSERT INTO config.upgrade_log (version) VALUES ('0001.data.config.org_unit_setting_type.sql');
+INSERT INTO config.upgrade_log (version) VALUES ('0001');
 
 INSERT INTO config.org_unit_setting_type (name, label, description, datatype) VALUES (
     'circ.holds.org_unit_target_weight',

diff --git a/Open-ILS/src/sql/Pg/upgrade/0002.schema.hold-index-on-unfilled_hold_list.sql b/Open-ILS/src/sql/Pg/upgrade/0002.schema.hold-index-on-unfilled_hold_list.sql
index 4e28cda..af42bff 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0002.schema.hold-index-on-unfilled_hold_list.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0002.schema.hold-index-on-unfilled_hold_list.sql
@@ -1,4 +1,4 @@
 BEGIN;
-INSERT INTO config.upgrade_log (version) VALUES ('0002.schema.hold-index-on-unfilled_hold_list.sql');
+INSERT INTO config.upgrade_log (version) VALUES ('0002');
 CREATE INDEX uhr_hold_idx ON action.unfulfilled_hold_list (hold);
 COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/0003.schema.hold-loop-counting.sql b/Open-ILS/src/sql/Pg/upgrade/0003.schema.hold-loop-counting.sql
index f222d1e..5d1e254 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0003.schema.hold-loop-counting.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0003.schema.hold-loop-counting.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-INSERT INTO config.upgrade_log (version) VALUES ('0003.schema.hold-loop-counting.sql');
+INSERT INTO config.upgrade_log (version) VALUES ('0003');
 
 CREATE OR REPLACE VIEW action.unfulfilled_hold_loops AS
     SELECT  u.hold,

diff --git a/Open-ILS/src/sql/Pg/upgrade/0004.data.org-setting-precat-circ-lib.sql b/Open-ILS/src/sql/Pg/upgrade/0004.data.org-setting-precat-circ-lib.sql
index ff678b0..bd2a2fb 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0004.data.org-setting-precat-circ-lib.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0004.data.org-setting-precat-circ-lib.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-INSERT INTO config.upgrade_log (version) VALUES ('0004.data.org-setting-precat-circ-lib.sql');
+INSERT INTO config.upgrade_log (version) VALUES ('0004');
 
 INSERT INTO config.org_unit_setting_type (name, label, description, datatype) VALUES (
     'circ.pre_cat_copy_circ_lib',

diff --git a/Open-ILS/src/sql/Pg/upgrade/0005.data.org-setting-max-claims-return-count.sql b/Open-ILS/src/sql/Pg/upgrade/0005.data.org-setting-max-claims-return-count.sql
index b7bfa6f..f6f5833 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0005.data.org-setting-max-claims-return-count.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0005.data.org-setting-max-claims-return-count.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-INSERT INTO config.upgrade_log (version) VALUES ('0005.data.org-setting-max-claims-return-count.sql');
+INSERT INTO config.upgrade_log (version) VALUES ('0005');
 
 INSERT INTO config.org_unit_setting_type (name, label, description, datatype) VALUES (
     'circ.max_patron_claim_return_count',

diff --git a/Open-ILS/src/sql/Pg/upgrade/0006.data.override-max-claims-returned-perm.sql b/Open-ILS/src/sql/Pg/upgrade/0006.data.override-max-claims-returned-perm.sql
index c68bbe7..bf90922 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0006.data.override-max-claims-returned-perm.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0006.data.override-max-claims-returned-perm.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-INSERT INTO config.upgrade_log (version) VALUES ('0006.data.override-max-claims-returned-perm.sql');
+INSERT INTO config.upgrade_log (version) VALUES ('0006');
 
 INSERT INTO permission.perm_list (code, description) VALUES (
     'SET_CIRC_CLAIMS_RETURNED.override',

diff --git a/Open-ILS/src/sql/Pg/upgrade/0007.data.org-setting-checkout-auto-renew-age.sql b/Open-ILS/src/sql/Pg/upgrade/0007.data.org-setting-checkout-auto-renew-age.sql
index 3469e0c..9bc7596 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0007.data.org-setting-checkout-auto-renew-age.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0007.data.org-setting-checkout-auto-renew-age.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-INSERT INTO config.upgrade_log (version) VALUES ('0007.data.org-setting-checkout-auto-renew-age.sql');
+INSERT INTO config.upgrade_log (version) VALUES ('0007');
 
 INSERT INTO config.org_unit_setting_type (name, label, description, datatype) VALUES (
     'circ.checkout_auto_renew_age',

diff --git a/Open-ILS/src/sql/Pg/upgrade/0008.data.org-setting-lib-supports-behind-desk-holds.sql b/Open-ILS/src/sql/Pg/upgrade/0008.data.org-setting-lib-supports-behind-desk-holds.sql
index 1167995..dcaed34 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0008.data.org-setting-lib-supports-behind-desk-holds.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0008.data.org-setting-lib-supports-behind-desk-holds.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-INSERT INTO config.upgrade_log (version) VALUES ('0008.data.org-setting-lib-supports-behind-desk-holds.sql');
+INSERT INTO config.upgrade_log (version) VALUES ('0008');
 
 INSERT INTO config.org_unit_setting_type (name, label, description, datatype) VALUES (
     'circ.holds.behind_desk_pickup_supported',

diff --git a/Open-ILS/src/sql/Pg/upgrade/0009.data.action-trigger-hold-cancel-hook.sql b/Open-ILS/src/sql/Pg/upgrade/0009.data.action-trigger-hold-cancel-hook.sql
index 144bb3a..3554fb8 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0009.data.action-trigger-hold-cancel-hook.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0009.data.action-trigger-hold-cancel-hook.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-INSERT INTO config.upgrade_log (version) VALUES ('0009.data.action-trigger-hold-cancel-hook.sql');
+INSERT INTO config.upgrade_log (version) VALUES ('0009');
 
 INSERT INTO action_trigger.hook (key,core_type,description) VALUES (
     'hold_request.cancel.expire_no_target',

diff --git a/Open-ILS/src/sql/Pg/upgrade/0010.schema.asset-copy-dummy-isbn.sql b/Open-ILS/src/sql/Pg/upgrade/0010.schema.asset-copy-dummy-isbn.sql
index 4789910..9ce7a8b 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0010.schema.asset-copy-dummy-isbn.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0010.schema.asset-copy-dummy-isbn.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-INSERT INTO config.upgrade_log (version) VALUES ('0010.schema.asset-copy-dummy-isbn.sql');
+INSERT INTO config.upgrade_log (version) VALUES ('0010');
 
 ALTER TABLE asset.copy
 ADD COLUMN dummy_isbn TEXT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/0011.data.org-setting-no-autoprint.sql b/Open-ILS/src/sql/Pg/upgrade/0011.data.org-setting-no-autoprint.sql
index 9544ab0..6cec3c5 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0011.data.org-setting-no-autoprint.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0011.data.org-setting-no-autoprint.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-INSERT INTO config.upgrade_log (version) VALUES ('0011.data.org-setting-no-autoprint.sql');
+INSERT INTO config.upgrade_log (version) VALUES ('0011');
 
 INSERT INTO config.org_unit_setting_type (name, label, description, datatype) VALUES (
     'circ.staff_client.do_not_auto_attempt_print',

diff --git a/Open-ILS/src/sql/Pg/upgrade/0012.schema.circ-parent-circ.sql b/Open-ILS/src/sql/Pg/upgrade/0012.schema.circ-parent-circ.sql
index 0a45163..3fa4ee7 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0012.schema.circ-parent-circ.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0012.schema.circ-parent-circ.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-INSERT INTO config.upgrade_log (version) VALUES ('0012.schema.circ-parent-circ.sql');
+INSERT INTO config.upgrade_log (version) VALUES ('0012');
 
 ALTER TABLE action.circulation
 ADD COLUMN parent_circ BIGINT

diff --git a/Open-ILS/src/sql/Pg/upgrade/0013.schema.circ-checkin-ws-and-scan-time.sql b/Open-ILS/src/sql/Pg/upgrade/0013.schema.circ-checkin-ws-and-scan-time.sql
index 6539fe1..f666dfd 100644 (file)
--- a/Open-ILS/src/sql/Pg/upgrade/0013.schema.circ-checkin-ws-and-scan-time.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0013.schema.circ-checkin-ws-and-scan-time.sql
@@ -1,6 +1,6 @@
 BEGIN;
 
-INSERT INTO config.upgrade_log (version) VALUES ('0013.schema.circ-checkin-ws-and-scan-time.sql');
+INSERT INTO config.upgrade_log (version) VALUES ('0013');
 
 ALTER TABLE action.circulation
 ADD COLUMN checkin_workstation INT

diff --git a/Open-ILS/src/sql/Pg/upgrade/0014.data.upgrade-versions-numeric-only.sql b/Open-ILS/src/sql/Pg/upgrade/0014.data.upgrade-versions-numeric-only.sql
new file mode 100644 (file)
index 0000000..839db8a
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0014.data.upgrade-versions-numeric-only.sql
@@ -0,0 +1,22 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0014');
+
+-- Changing the rules retroactively:
+-- versions should be numeric only
+
+UPDATE config.upgrade_log set version = '0001' where version = '0001.data.config.org_unit_setting_type.sql';
+UPDATE config.upgrade_log set version = '0002' where version = '0002.schema.hold-index-on-unfilled_hold_list.sql';
+UPDATE config.upgrade_log set version = '0003' where version = '0003.schema.hold-loop-counting.sql';
+UPDATE config.upgrade_log set version = '0004' where version = '0004.data.org-setting-precat-circ-lib.sql';
+UPDATE config.upgrade_log set version = '0005' where version = '0005.data.org-setting-max-claims-return-count.sql';
+UPDATE config.upgrade_log set version = '0006' where version = '0006.data.override-max-claims-returned-perm.sql';
+UPDATE config.upgrade_log set version = '0007' where version = '0007.data.org-setting-checkout-auto-renew-age.sql';
+UPDATE config.upgrade_log set version = '0008' where version = '0008.data.org-setting-lib-supports-behind-desk-holds.sql';
+UPDATE config.upgrade_log set version = '0009' where version = '0009.data.action-trigger-hold-cancel-hook.sql';
+UPDATE config.upgrade_log set version = '0010' where version = '0010.schema.asset-copy-dummy-isbn.sql';
+UPDATE config.upgrade_log set version = '0011' where version = '0011.data.org-setting-no-autoprint.sql';
+UPDATE config.upgrade_log set version = '0012' where version = '0012.schema.circ-parent-circ.sql';
+UPDATE config.upgrade_log set version = '0013' where version = '0013.schema.circ-checkin-ws-and-scan-time.sql';
+
+COMMIT;