LP#1835736: stamp schema update

Signed-off-by: Galen Charlton <gmc@equinoxinitiative.org>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index bd961a1..d2e09d2 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 ('1222', :eg_version); -- miker/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1224', :eg_version); -- rhamby/gmcharlt
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/1224.data.preloaded_audio.sql b/Open-ILS/src/sql/Pg/upgrade/1224.data.preloaded_audio.sql
new file mode 100644 (file)
index 0000000..6954dc8
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1224.data.preloaded_audio.sql
@@ -0,0 +1,19 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('1224', :eg_version);
+
+INSERT INTO config.coded_value_map (id,ctype,code,opac_visible,is_simple,value,search_label) VALUES
+(1736,'icon_format','preloadedaudio',TRUE,FALSE,
+    oils_i18n_gettext(1736, 'Preloaded Audio', 'ccvm', 'value'),
+    oils_i18n_gettext(1736, 'Preloaded Audio', 'ccvm', 'search_label')),
+(1737,'search_format','preloadedaudio',TRUE,FALSE,
+    oils_i18n_gettext(1737, 'Preloaded Audio', 'ccvm', 'value'),
+    oils_i18n_gettext(1737, 'Preloaded Audio', 'ccvm', 'search_label'))
+;
+
+INSERT INTO config.composite_attr_entry_definition (coded_value, definition) VALUES
+((SELECT id from config.coded_value_map where ctype = 'search_format' AND code = 'preloadedaudio'),'{"0":{"_attr":"item_type","_val":"i"},"1":{"_attr":"item_form","_val":"q"}}'),
+((SELECT id from config.coded_value_map where ctype = 'icon_format' AND code = 'preloadedaudio'),'{"0":{"_attr":"item_type","_val":"i"},"1":{"_attr":"item_form","_val":"q"}}');
+
+
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/xxxx.data.preloaded_audio.sql b/Open-ILS/src/sql/Pg/upgrade/xxxx.data.preloaded_audio.sql
deleted file mode 100644 (file)
index e5ee9e1..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/xxxx.data.preloaded_audio.sql
+++ /dev/null
@@ -1,19 +0,0 @@
-BEGIN;
-
-SELECT evergreen.upgrade_deps_block_check('xxxx', :eg_version);
-
-INSERT INTO config.coded_value_map (id,ctype,code,opac_visible,is_simple,value,search_label) VALUES
-(1736,'icon_format','preloadedaudio',TRUE,FALSE,
-    oils_i18n_gettext(1736, 'Preloaded Audio', 'ccvm', 'value'),
-    oils_i18n_gettext(1736, 'Preloaded Audio', 'ccvm', 'search_label')),
-(1737,'search_format','preloadedaudio',TRUE,FALSE,
-    oils_i18n_gettext(1737, 'Preloaded Audio', 'ccvm', 'value'),
-    oils_i18n_gettext(1737, 'Preloaded Audio', 'ccvm', 'search_label'))
-;
-
-INSERT INTO config.composite_attr_entry_definition (coded_value, definition) VALUES
-((SELECT id from config.coded_value_map where ctype = 'search_format' AND code = 'preloadedaudio'),'{"0":{"_attr":"item_type","_val":"i"},"1":{"_attr":"item_form","_val":"q"}}'),
-((SELECT id from config.coded_value_map where ctype = 'icon_format' AND code = 'preloadedaudio'),'{"0":{"_attr":"item_type","_val":"i"},"1":{"_attr":"item_form","_val":"q"}}');
-
-
-COMMIT;