pin upgrade version number for magic macros

Signed-off-by: Jason Etheridge <jason@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 941ea93..9a80f6f 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 ('0610', :eg_version); -- miker/berick
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0611', :eg_version); -- miker/berick
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/0611.data.magic_macros.sql b/Open-ILS/src/sql/Pg/upgrade/0611.data.magic_macros.sql
new file mode 100644 (file)
index 0000000..402ee10
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0611.data.magic_macros.sql
@@ -0,0 +1,90 @@
+-- Evergreen DB patch 0611.data.magic_macros.sql
+BEGIN;
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0611', :eg_version);
+
+INSERT into config.org_unit_setting_type
+( name, label, description, datatype ) VALUES
+(
+        'circ.staff_client.receipt.header_text',
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.header_text',
+            'Receipt Template: Content of header_text include',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.header_text',
+            'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(header_text)%',
+            'coust',
+            'description'
+        ),
+        'string'
+    )
+,(
+        'circ.staff_client.receipt.footer_text',
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.footer_text',
+            'Receipt Template: Content of footer_text include',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.footer_text',
+            'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(footer_text)%',
+            'coust',
+            'description'
+        ),
+        'string'
+    )
+,(
+        'circ.staff_client.receipt.notice_text',
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.notice_text',
+            'Receipt Template: Content of notice_text include',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.notice_text',
+            'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(notice_text)%',
+            'coust',
+            'description'
+        ),
+        'string'
+    )
+,(
+        'circ.staff_client.receipt.alert_text',
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.alert_text',
+            'Receipt Template: Content of alert_text include',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.alert_text',
+            'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(alert_text)%',
+            'coust',
+            'description'
+        ),
+        'string'
+    )
+,(
+        'circ.staff_client.receipt.event_text',
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.event_text',
+            'Receipt Template: Content of event_text include',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'circ.staff_client.receipt.event_text',
+            'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(event_text)%',
+            'coust',
+            'description'
+        ),
+        'string'
+    );
+
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.magic_macros.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.magic_macros.sql
deleted file mode 100644 (file)
index 6bfce60..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.magic_macros.sql
+++ /dev/null
@@ -1,82 +0,0 @@
-INSERT into config.org_unit_setting_type
-( name, label, description, datatype ) VALUES
-(
-        'circ.staff_client.receipt.header_text',
-        oils_i18n_gettext(
-            'circ.staff_client.receipt.header_text',
-            'Receipt Template: Content of header_text include',
-            'coust',
-            'label'
-        ),
-        oils_i18n_gettext(
-            'circ.staff_client.receipt.header_text',
-            'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(header_text)%',
-            'coust',
-            'description'
-        ),
-        'string'
-    )
-,(
-        'circ.staff_client.receipt.footer_text',
-        oils_i18n_gettext(
-            'circ.staff_client.receipt.footer_text',
-            'Receipt Template: Content of footer_text include',
-            'coust',
-            'label'
-        ),
-        oils_i18n_gettext(
-            'circ.staff_client.receipt.footer_text',
-            'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(footer_text)%',
-            'coust',
-            'description'
-        ),
-        'string'
-    )
-,(
-        'circ.staff_client.receipt.notice_text',
-        oils_i18n_gettext(
-            'circ.staff_client.receipt.notice_text',
-            'Receipt Template: Content of notice_text include',
-            'coust',
-            'label'
-        ),
-        oils_i18n_gettext(
-            'circ.staff_client.receipt.notice_text',
-            'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(notice_text)%',
-            'coust',
-            'description'
-        ),
-        'string'
-    )
-,(
-        'circ.staff_client.receipt.alert_text',
-        oils_i18n_gettext(
-            'circ.staff_client.receipt.alert_text',
-            'Receipt Template: Content of alert_text include',
-            'coust',
-            'label'
-        ),
-        oils_i18n_gettext(
-            'circ.staff_client.receipt.alert_text',
-            'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(alert_text)%',
-            'coust',
-            'description'
-        ),
-        'string'
-    )
-,(
-        'circ.staff_client.receipt.event_text',
-        oils_i18n_gettext(
-            'circ.staff_client.receipt.event_text',
-            'Receipt Template: Content of event_text include',
-            'coust',
-            'label'
-        ),
-        oils_i18n_gettext(
-            'circ.staff_client.receipt.event_text',
-            'Text/HTML/Macros to be inserted into receipt templates in place of %INCLUDE(event_text)%',
-            'coust',
-            'description'
-        ),
-        'string'
-    );