pin version for upgrade script

and put seed data back in; I had merge-conflict-resolved it out of existence previously

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 485ee71..74d3fca 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -57,7 +57,7 @@ CREATE TABLE config.upgrade_log (
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0631'); -- senator/miker
+INSERT INTO config.upgrade_log (version) VALUES ('0633'); -- tsbere/phasefx
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
index c0b1d5a..3751ba4 100644 (file)
--- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql
+++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql
@@ -2726,7 +2726,26 @@ INSERT into config.org_unit_setting_type
 ( 'opac.fully_compressed_serial_holdings',
     oils_i18n_gettext('opac.fully_compressed_serial_holdings', 'OPAC: Use fully compressed serial holdings', 'coust', 'label'),
     oils_i18n_gettext('opac.fully_compressed_serial_holdings', 'Show fully compressed serial holdings for all libraries at and below the current context unit', 'coust', 'description'),
-    'bool')
+    'bool'),
+
+(
+        'print.custom_js_file',
+        oils_i18n_gettext(
+            'print.custom_js_file',
+            'Printing: Custom Javascript File',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'print.custom_js_file',
+            'Full URL path to a Javascript File to be loaded when printing. Should'
+            || ' implement a print_custom function for DOM manipulation. Can change'
+            || ' the value of the do_print variable to false to cancel printing.',
+            'coust',
+            'description'
+        ),
+        'string'
+    )
 ;
 
 UPDATE config.org_unit_setting_type

diff --git a/Open-ILS/src/sql/Pg/upgrade/0633.new_print_method.sql b/Open-ILS/src/sql/Pg/upgrade/0633.new_print_method.sql
new file mode 100644 (file)
index 0000000..9298aaf
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0633.new_print_method.sql
@@ -0,0 +1,27 @@
+BEGIN;
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0633', :eg_version);
+
+INSERT into config.org_unit_setting_type
+( name, grp, label, description, datatype ) VALUES
+(
+        'print.custom_js_file', 'circ',
+        oils_i18n_gettext(
+            'print.custom_js_file',
+            'Printing: Custom Javascript File',
+            'coust',
+            'label'
+        ),
+        oils_i18n_gettext(
+            'print.custom_js_file',
+            'Full URL path to a Javascript File to be loaded when printing. Should'
+            || ' implement a print_custom function for DOM manipulation. Can change'
+            || ' the value of the do_print variable to false to cancel printing.',
+            'coust',
+            'description'
+        ),
+        'string'
+    );
+
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.new_print_method.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.new_print_method.sql
deleted file mode 100644 (file)
index bb7d8da..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.new_print_method.sql
+++ /dev/null
@@ -1,20 +0,0 @@
-INSERT into config.org_unit_setting_type
-( name, grp, label, description, datatype ) VALUES
-(
-        'print.custom_js_file', 'circ',
-        oils_i18n_gettext(
-            'print.custom_js_file',
-            'Printing: Custom Javascript File',
-            'coust',
-            'label'
-        ),
-        oils_i18n_gettext(
-            'print.custom_js_file',
-            'Full URL path to a Javascript File to be loaded when printing. Should'
-            || ' implement a print_custom function for DOM manipulation. Can change'
-            || ' the value of the do_print variable to false to cancel printing.',
-            'coust',
-            'description'
-        ),
-        'string'
-    );