Stamping upgrade script

Signed-off-by: Mike Rylander <mrylander@gmail.com>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index ad8335b..4f5da68 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,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 ('1146', :eg_version); -- jeffdavis/csharp
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1147', :eg_version); -- berick/miker
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/1147.data.server-admin-grid-settings.sql b/Open-ILS/src/sql/Pg/upgrade/1147.data.server-admin-grid-settings.sql
new file mode 100644 (file)
index 0000000..f204c81
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1147.data.server-admin-grid-settings.sql
@@ -0,0 +1,254 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1147', :eg_version);
+
+INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
+VALUES (
+    'eg.grid.admin.server.config.rule_age_hold_protect', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.rule_age_hold_protect',
+        'Grid Config: admin.server.config.rule_age_hold_protect',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.asset.stat_cat_sip_fields', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.asset.stat_cat_sip_fields',
+        'Grid Config: admin.server.asset.stat_cat_sip_fields',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.actor.stat_cat_sip_fields', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.actor.stat_cat_sip_fields',
+        'Grid Config: admin.server.actor.stat_cat_sip_fields',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.authority.browse_axis', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.authority.browse_axis',
+        'Grid Config: admin.server.authority.browse_axis',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.authority.control_set', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.authority.control_set',
+        'Grid Config: admin.server.authority.control_set',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.authority.heading_field', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.authority.heading_field',
+        'Grid Config: admin.server.authority.heading_field',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.authority.thesaurus', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.authority.thesaurus',
+        'Grid Config: admin.server.authority.thesaurus',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.best_hold_order', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.best_hold_order',
+        'Grid Config: admin.server.config.best_hold_order',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.billing_type', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.billing_type',
+        'Grid Config: admin.server.config.billing_type',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.asset.call_number_prefix', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.asset.call_number_prefix',
+        'Grid Config: admin.server.asset.call_number_prefix',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.asset.call_number_suffix', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.asset.call_number_suffix',
+        'Grid Config: admin.server.asset.call_number_suffix',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.rule_circ_duration', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.rule_circ_duration',
+        'Grid Config: admin.server.config.rule_circ_duration',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.circ_limit_group', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.circ_limit_group',
+        'Grid Config: admin.server.config.circ_limit_group',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.circ_matrix_weights', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.circ_matrix_weights',
+        'Grid Config: admin.server.config.circ_matrix_weights',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.rule_max_fine', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.rule_max_fine',
+        'Grid Config: admin.server.config.rule_max_fine',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.circ_modifier', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.circ_modifier',
+        'Grid Config: admin.server.config.circ_modifier',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.copy_status', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.copy_status',
+        'Grid Config: admin.server.config.copy_status',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.floating_group', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.floating_group',
+        'Grid Config: admin.server.config.floating_group',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.global_flag', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.global_flag',
+        'Grid Config: admin.server.config.global_flag',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.hard_due_date', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.hard_due_date',
+        'Grid Config: admin.server.config.hard_due_date',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.hold_matrix_weights', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.hold_matrix_weights',
+        'Grid Config: admin.server.config.hold_matrix_weights',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.vandelay.match_set', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.vandelay.match_set',
+        'Grid Config: admin.server.vandelay.match_set',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.coded_value_map', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.coded_value_map',
+        'Grid Config: admin.server.config.coded_value_map',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.vandelay.import_bib_trash_group', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.vandelay.import_bib_trash_group',
+        'Grid Config: admin.server.vandelay.import_bib_trash_group',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.record_attr_definition', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.record_attr_definition',
+        'Grid Config: admin.server.config.record_attr_definition',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.metabib_class', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.metabib_class',
+        'Grid Config: admin.server.config.metabib_class',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.metabib_field_ts_map', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.metabib_field_ts_map',
+        'Grid Config: admin.server.config.metabib_field_ts_map',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.metabib_field', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.metabib_field',
+        'Grid Config: admin.server.config.metabib_field',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.permission.perm_list', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.permission.perm_list',
+        'Grid Config: admin.server.permission.perm_list',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.remote_account', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.remote_account',
+        'Grid Config: admin.server.config.remote_account',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.sms_carrier', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.sms_carrier',
+        'Grid Config: admin.server.config.sms_carrier',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.usr_activity_type', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.usr_activity_type',
+        'Grid Config: admin.server.config.usr_activity_type',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.weight_assoc', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.weight_assoc',
+        'Grid Config: admin.server.config.weight_assoc',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.z3950_index_field_map', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.z3950_index_field_map',
+        'Grid Config: admin.server.config.z3950_index_field_map',
+        'cwst', 'label'
+    )
+), (
+    'eg.grid.admin.server.config.z3950_source', 'gui', 'object',
+    oils_i18n_gettext(
+        'eg.grid.admin.server.config.z3950_source',
+        'Grid Config: admin.server.config.z3950_source',
+        'cwst', 'label'
+    )
+);
+
+COMMIT;
+

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.server-admin-grid-settings.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.server-admin-grid-settings.sql
deleted file mode 100644 (file)
index e704df9..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.server-admin-grid-settings.sql
+++ /dev/null
@@ -1,254 +0,0 @@
-BEGIN;
-
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
-INSERT INTO config.workstation_setting_type (name, grp, datatype, label)
-VALUES (
-    'eg.grid.admin.server.config.rule_age_hold_protect', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.rule_age_hold_protect',
-        'Grid Config: admin.server.config.rule_age_hold_protect',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.asset.stat_cat_sip_fields', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.asset.stat_cat_sip_fields',
-        'Grid Config: admin.server.asset.stat_cat_sip_fields',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.actor.stat_cat_sip_fields', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.actor.stat_cat_sip_fields',
-        'Grid Config: admin.server.actor.stat_cat_sip_fields',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.authority.browse_axis', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.authority.browse_axis',
-        'Grid Config: admin.server.authority.browse_axis',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.authority.control_set', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.authority.control_set',
-        'Grid Config: admin.server.authority.control_set',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.authority.heading_field', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.authority.heading_field',
-        'Grid Config: admin.server.authority.heading_field',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.authority.thesaurus', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.authority.thesaurus',
-        'Grid Config: admin.server.authority.thesaurus',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.best_hold_order', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.best_hold_order',
-        'Grid Config: admin.server.config.best_hold_order',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.billing_type', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.billing_type',
-        'Grid Config: admin.server.config.billing_type',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.asset.call_number_prefix', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.asset.call_number_prefix',
-        'Grid Config: admin.server.asset.call_number_prefix',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.asset.call_number_suffix', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.asset.call_number_suffix',
-        'Grid Config: admin.server.asset.call_number_suffix',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.rule_circ_duration', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.rule_circ_duration',
-        'Grid Config: admin.server.config.rule_circ_duration',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.circ_limit_group', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.circ_limit_group',
-        'Grid Config: admin.server.config.circ_limit_group',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.circ_matrix_weights', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.circ_matrix_weights',
-        'Grid Config: admin.server.config.circ_matrix_weights',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.rule_max_fine', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.rule_max_fine',
-        'Grid Config: admin.server.config.rule_max_fine',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.circ_modifier', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.circ_modifier',
-        'Grid Config: admin.server.config.circ_modifier',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.copy_status', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.copy_status',
-        'Grid Config: admin.server.config.copy_status',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.floating_group', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.floating_group',
-        'Grid Config: admin.server.config.floating_group',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.global_flag', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.global_flag',
-        'Grid Config: admin.server.config.global_flag',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.hard_due_date', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.hard_due_date',
-        'Grid Config: admin.server.config.hard_due_date',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.hold_matrix_weights', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.hold_matrix_weights',
-        'Grid Config: admin.server.config.hold_matrix_weights',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.vandelay.match_set', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.vandelay.match_set',
-        'Grid Config: admin.server.vandelay.match_set',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.coded_value_map', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.coded_value_map',
-        'Grid Config: admin.server.config.coded_value_map',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.vandelay.import_bib_trash_group', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.vandelay.import_bib_trash_group',
-        'Grid Config: admin.server.vandelay.import_bib_trash_group',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.record_attr_definition', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.record_attr_definition',
-        'Grid Config: admin.server.config.record_attr_definition',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.metabib_class', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.metabib_class',
-        'Grid Config: admin.server.config.metabib_class',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.metabib_field_ts_map', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.metabib_field_ts_map',
-        'Grid Config: admin.server.config.metabib_field_ts_map',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.metabib_field', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.metabib_field',
-        'Grid Config: admin.server.config.metabib_field',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.permission.perm_list', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.permission.perm_list',
-        'Grid Config: admin.server.permission.perm_list',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.remote_account', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.remote_account',
-        'Grid Config: admin.server.config.remote_account',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.sms_carrier', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.sms_carrier',
-        'Grid Config: admin.server.config.sms_carrier',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.usr_activity_type', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.usr_activity_type',
-        'Grid Config: admin.server.config.usr_activity_type',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.weight_assoc', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.weight_assoc',
-        'Grid Config: admin.server.config.weight_assoc',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.z3950_index_field_map', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.z3950_index_field_map',
-        'Grid Config: admin.server.config.z3950_index_field_map',
-        'cwst', 'label'
-    )
-), (
-    'eg.grid.admin.server.config.z3950_source', 'gui', 'object',
-    oils_i18n_gettext(
-        'eg.grid.admin.server.config.z3950_source',
-        'Grid Config: admin.server.config.z3950_source',
-        'cwst', 'label'
-    )
-);
-
-COMMIT;
-