breaking out the blu-ray patch to allow actual upgrade to 2.1

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
index ba089c2..d098d0e 100644 (file)
--- a/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
@@ -9749,49 +9749,49 @@ INSERT INTO vandelay.import_error ( code, description )
 
 
 
--- Evergreen DB patch 0685.data.bluray_vr_format.sql
+---- Evergreen DB patch 0685.data.bluray_vr_format.sql
+----
+---- FIXME: insert description of change, if needed
+----
 --
--- FIXME: insert description of change, if needed
 --
-
-
--- check whether patch can be applied
-SELECT evergreen.upgrade_deps_block_check('0685', :eg_version);
-
--- FIXME: add/check SQL statements to perform the upgrade
-DO $FUNC$
-DECLARE
-    same_marc BOOL;
-BEGIN
-    -- Check if it is already there
-    PERFORM * FROM config.marc21_physical_characteristic_value_map v
-        JOIN config.marc21_physical_characteristic_subfield_map s ON v.ptype_subfield = s.id
-        WHERE s.ptype_key = 'v' AND s.subfield = 'e' AND s.start_pos = '4' AND s.length = '1'
-            AND v.value = 's';
-
-    -- If it is, bail.
-    IF FOUND THEN
-        RETURN;
-    END IF;
-
-    -- Otherwise, insert it
-    INSERT INTO config.marc21_physical_characteristic_value_map (value,ptype_subfield,label)
-    SELECT 's',id,'Blu-ray'
-        FROM config.marc21_physical_characteristic_subfield_map
-        WHERE ptype_key = 'v' AND subfield = 'e' AND start_pos = '4' AND length = '1';
-
-    -- And reingest the blue-ray items so that things see the new value
-    SELECT INTO same_marc enabled FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc';
-    UPDATE config.internal_flag SET enabled = true WHERE name = 'ingest.reingest.force_on_same_marc';
-    UPDATE biblio.record_entry SET marc=marc WHERE id IN (SELECT record
-        FROM
-            metabib.full_rec a JOIN metabib.full_rec b USING (record)
-        WHERE
-            a.tag = 'LDR' AND a.value LIKE '______g%'
-        AND b.tag = '007' AND b.value LIKE 'v___s%');
-    UPDATE config.internal_flag SET enabled = same_marc WHERE name = 'ingest.reingest.force_on_same_marc';
-END;
-$FUNC$;
+---- check whether patch can be applied
+--SELECT evergreen.upgrade_deps_block_check('0685', :eg_version);
+--
+---- FIXME: add/check SQL statements to perform the upgrade
+--DO $FUNC$
+--DECLARE
+--    same_marc BOOL;
+--BEGIN
+--    -- Check if it is already there
+--    PERFORM * FROM config.marc21_physical_characteristic_value_map v
+--        JOIN config.marc21_physical_characteristic_subfield_map s ON v.ptype_subfield = s.id
+--        WHERE s.ptype_key = 'v' AND s.subfield = 'e' AND s.start_pos = '4' AND s.length = '1'
+--            AND v.value = 's';
+--
+--    -- If it is, bail.
+--    IF FOUND THEN
+--        RETURN;
+--    END IF;
+--
+--    -- Otherwise, insert it
+--    INSERT INTO config.marc21_physical_characteristic_value_map (value,ptype_subfield,label)
+--    SELECT 's',id,'Blu-ray'
+--        FROM config.marc21_physical_characteristic_subfield_map
+--        WHERE ptype_key = 'v' AND subfield = 'e' AND start_pos = '4' AND length = '1';
+--
+--    -- And reingest the blue-ray items so that things see the new value
+--    SELECT INTO same_marc enabled FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc';
+--    UPDATE config.internal_flag SET enabled = true WHERE name = 'ingest.reingest.force_on_same_marc';
+--    UPDATE biblio.record_entry SET marc=marc WHERE id IN (SELECT record
+--        FROM
+--            metabib.full_rec a JOIN metabib.full_rec b USING (record)
+--        WHERE
+--            a.tag = 'LDR' AND a.value LIKE '______g%'
+--        AND b.tag = '007' AND b.value LIKE 'v___s%');
+--    UPDATE config.internal_flag SET enabled = same_marc WHERE name = 'ingest.reingest.force_on_same_marc';
+--END;
+--$FUNC$;
 
 
 -- Evergreen DB patch 0686.schema.auditor_boost.sql

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/pines-blu-ray.sql b/Open-ILS/src/sql/Pg/version-upgrade/pines-blu-ray.sql
new file mode 100644 (file)
index 0000000..95dda74
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/version-upgrade/pines-blu-ray.sql
@@ -0,0 +1,47 @@
+-- Evergreen DB patch 0685.data.bluray_vr_format.sql
+--
+-- FIXME: insert description of change, if needed
+--
+BEGIN;
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0685', :eg_version);
+
+-- FIXME: add/check SQL statements to perform the upgrade
+DO $FUNC$
+DECLARE
+    same_marc BOOL;
+BEGIN
+    -- Check if it is already there
+    PERFORM * FROM config.marc21_physical_characteristic_value_map v
+        JOIN config.marc21_physical_characteristic_subfield_map s ON v.ptype_subfield = s.id
+        WHERE s.ptype_key = 'v' AND s.subfield = 'e' AND s.start_pos = '4' AND s.length = '1'
+            AND v.value = 's';
+
+    -- If it is, bail.
+    IF FOUND THEN
+        RETURN;
+    END IF;
+
+    -- Otherwise, insert it
+    INSERT INTO config.marc21_physical_characteristic_value_map (value,ptype_subfield,label)
+    SELECT 's',id,'Blu-ray'
+        FROM config.marc21_physical_characteristic_subfield_map
+        WHERE ptype_key = 'v' AND subfield = 'e' AND start_pos = '4' AND length = '1';
+
+    -- And reingest the blue-ray items so that things see the new value
+    SELECT INTO same_marc enabled FROM config.internal_flag WHERE name = 'ingest.reingest.force_on_same_marc';
+    UPDATE config.internal_flag SET enabled = true WHERE name = 'ingest.reingest.force_on_same_marc';
+    UPDATE biblio.record_entry SET marc=marc WHERE id IN (SELECT record
+        FROM
+            metabib.full_rec a JOIN metabib.full_rec b USING (record)
+        WHERE
+            a.tag = 'LDR' AND a.value LIKE '______g%'
+        AND b.tag = '007' AND b.value LIKE 'v___s%');
+    UPDATE config.internal_flag SET enabled = same_marc WHERE name = 'ingest.reingest.force_on_same_marc';
+END;
+$FUNC$;
+
+
+COMMIT;