Stamped upgrade for 'allow fines during closings'

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 e826a06..02d4aa8 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 ('0691', :eg_version); -- senator/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0692', :eg_version); -- miker/berick
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/0692.data.fine-when-closed.sql b/Open-ILS/src/sql/Pg/upgrade/0692.data.fine-when-closed.sql
new file mode 100644 (file)
index 0000000..e55ee2f
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0692.data.fine-when-closed.sql
@@ -0,0 +1,25 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0693', :eg_version);
+
+INSERT INTO config.org_unit_setting_type
+    (name, label, description, grp, datatype)
+    VALUES (
+        'circ.fines.charge_when_closed',
+         oils_i18n_gettext(
+            'circ.fines.charge_when_closed',
+            'Charge fines on overdue circulations when closed',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'circ.fines.charge_when_closed',
+            'Normally, fines are not charged when a library is closed.  When set to True, fines will be charged during scheduled closings and normal weekly closed days.',
+            'coust',
+            'description'
+        ),
+        'circ',
+        'bool'
+    );
+
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fine-when-closed.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fine-when-closed.sql
deleted file mode 100644 (file)
index e3989cd..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.fine-when-closed.sql
+++ /dev/null
@@ -1,21 +0,0 @@
-
-INSERT INTO config.org_unit_setting_type
-    (name, label, description, grp, datatype)
-    VALUES (
-        'circ.fines.charge_when_closed',
-         oils_i18n_gettext(
-            'circ.fines.charge_when_closed',
-            'Charge fines on overdue circulations when closed',
-            'coust',
-            'label'
-        ),
-        oils_i18n_gettext(
-            'circ.fines.charge_when_closed',
-            'Normally, fines are not charged when a library is closed.  When set to True, fines will be charged during scheduled closings and normal weekly closed days.',
-            'coust',
-            'description'
-        ),
-        'circ',
-        'bool'
-    );
-