Wrap upgrade script for TPAC advanced search VR formats

Signed-off-by: Dan Scott <dscott@laurentian.ca>

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index ec191cb..420b915 100644 (file)
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -87,7 +87,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 ('0728', :eg_version); -- berick/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0729', :eg_version); -- tsbere/denials
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/0729.vr_format_value_maps.sql b/Open-ILS/src/sql/Pg/upgrade/0729.vr_format_value_maps.sql
new file mode 100644 (file)
index 0000000..7d5ceb4
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0729.vr_format_value_maps.sql
@@ -0,0 +1,59 @@
+-- Evergreen DB patch 0729.vr_format_value_maps.sql
+--
+BEGIN;
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0729', :eg_version);
+
+CREATE OR REPLACE FUNCTION config.update_coded_value_map(in_ctype TEXT, in_code TEXT, in_value TEXT, in_description TEXT DEFAULT NULL, in_opac_visible BOOL DEFAULT NULL, in_search_label TEXT DEFAULT NULL, in_is_simple BOOL DEFAULT NULL, add_only BOOL DEFAULT FALSE) RETURNS VOID AS $f$
+DECLARE
+    current_row config.coded_value_map%ROWTYPE;
+BEGIN
+    -- Look for a current value
+    SELECT INTO current_row * FROM config.coded_value_map WHERE ctype = in_ctype AND code = in_code;
+    -- If we have one..
+    IF FOUND AND NOT add_only THEN
+        -- Update anything we were handed
+        current_row.value := COALESCE(current_row.value, in_value);
+        current_row.description := COALESCE(current_row.description, in_description);
+        current_row.opac_visible := COALESCE(current_row.opac_visible, in_opac_visible);
+        current_row.search_label := COALESCE(current_row.search_label, in_search_label);
+        current_row.is_simple := COALESCE(current_row.is_simple, in_is_simple);
+        UPDATE config.coded_value_map
+            SET
+                value = current_row.value,
+                description = current_row.description,
+                opac_visible = current_row.opac_visible,
+                search_label = current_row.search_label,
+                is_simple = current_row.is_simple
+            WHERE id = current_row.id;
+    ELSE
+        INSERT INTO config.coded_value_map(ctype, code, value, description, opac_visible, search_label, is_simple) VALUES
+            (in_ctype, in_code, in_value, in_description, COALESCE(in_opac_visible, TRUE), in_search_label, COALESCE(in_is_simple, FALSE));
+    END IF;
+END;
+$f$ LANGUAGE PLPGSQL;
+
+SELECT config.update_coded_value_map('vr_format', 'a', 'Beta', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'b', 'VHS', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'c', 'U-matic', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'd', 'EIAJ', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'e', 'Type C', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'f', 'Quadruplex', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'g', 'Laserdisc', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'h', 'CED videodisc', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'i', 'Betacam', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'j', 'Betacam SP', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'k', 'Super-VHS', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'm', 'M-II', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'o', 'D-2', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'p', '8 mm.', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'q', 'Hi-8 mm.', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 's', 'Blu-ray disc', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'u', 'Unknown', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'v', 'DVD', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', 'z', 'Other', add_only := TRUE);
+SELECT config.update_coded_value_map('vr_format', ' ', 'Unspecified', add_only := TRUE);
+
+
+COMMIT;

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.vr_format_value_maps.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.vr_format_value_maps.sql
deleted file mode 100644 (file)
index 21d9d24..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.vr_format_value_maps.sql
+++ /dev/null
@@ -1,49 +0,0 @@
-CREATE OR REPLACE FUNCTION config.update_coded_value_map(in_ctype TEXT, in_code TEXT, in_value TEXT, in_description TEXT DEFAULT NULL, in_opac_visible BOOL DEFAULT NULL, in_search_label TEXT DEFAULT NULL, in_is_simple BOOL DEFAULT NULL, add_only BOOL DEFAULT FALSE) RETURNS VOID AS $f$
-DECLARE
-    current_row config.coded_value_map%ROWTYPE;
-BEGIN
-    -- Look for a current value
-    SELECT INTO current_row * FROM config.coded_value_map WHERE ctype = in_ctype AND code = in_code;
-    -- If we have one..
-    IF FOUND AND NOT add_only THEN
-        -- Update anything we were handed
-        current_row.value := COALESCE(current_row.value, in_value);
-        current_row.description := COALESCE(current_row.description, in_description);
-        current_row.opac_visible := COALESCE(current_row.opac_visible, in_opac_visible);
-        current_row.search_label := COALESCE(current_row.search_label, in_search_label);
-        current_row.is_simple := COALESCE(current_row.is_simple, in_is_simple);
-        UPDATE config.coded_value_map
-            SET
-                value = current_row.value,
-                description = current_row.description,
-                opac_visible = current_row.opac_visible,
-                search_label = current_row.search_label,
-                is_simple = current_row.is_simple
-            WHERE id = current_row.id;
-    ELSE
-        INSERT INTO config.coded_value_map(ctype, code, value, description, opac_visible, search_label, is_simple) VALUES
-            (in_ctype, in_code, in_value, in_description, COALESCE(in_opac_visible, TRUE), in_search_label, COALESCE(in_is_simple, FALSE));
-    END IF;
-END;
-$f$ LANGUAGE PLPGSQL;
-
-SELECT config.update_coded_value_map('vr_format', 'a', 'Beta', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'b', 'VHS', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'c', 'U-matic', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'd', 'EIAJ', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'e', 'Type C', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'f', 'Quadruplex', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'g', 'Laserdisc', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'h', 'CED videodisc', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'i', 'Betacam', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'j', 'Betacam SP', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'k', 'Super-VHS', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'm', 'M-II', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'o', 'D-2', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'p', '8 mm.', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'q', 'Hi-8 mm.', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 's', 'Blu-ray disc', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'u', 'Unknown', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'v', 'DVD', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', 'z', 'Other', add_only := TRUE);
-SELECT config.update_coded_value_map('vr_format', ' ', 'Unspecified', add_only := TRUE);