LP1928258: stamp schema update

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

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index b8b675a..985e815 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 ('1294', :eg_version); -- mmorgan / tlittle / JBoyer
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1295', :eg_version); -- berkick / cmorgan / gmcharlt
 
 CREATE TABLE config.bib_source (
        id              SERIAL  PRIMARY KEY,

diff --git a/Open-ILS/src/sql/Pg/upgrade/1295.schema.vandelay-update-edit-date.sql b/Open-ILS/src/sql/Pg/upgrade/1295.schema.vandelay-update-edit-date.sql
new file mode 100644 (file)
index 0000000..44a3fed
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/1295.schema.vandelay-update-edit-date.sql
@@ -0,0 +1,84 @@
+BEGIN;
+
+-- SELECT evergreen.upgrade_deps_block_check('TODO', :eg_version);
+
+ALTER TABLE vandelay.merge_profile
+    ADD COLUMN update_bib_editor BOOLEAN NOT NULL DEFAULT FALSE;
+
+-- By default, updating bib source means updating the editor.
+UPDATE vandelay.merge_profile SET update_bib_editor = update_bib_source;
+
+CREATE OR REPLACE FUNCTION vandelay.overlay_bib_record 
+    ( import_id BIGINT, eg_id BIGINT, merge_profile_id INT ) RETURNS BOOL AS $$
+DECLARE
+    editor_string   TEXT;
+    editor_id       INT;
+    v_marc          TEXT;
+    v_bib_source    INT;
+    update_fields   TEXT[];
+    update_query    TEXT;
+    update_bib_source BOOL;
+    update_bib_editor BOOL;
+BEGIN
+
+    SELECT  q.marc, q.bib_source INTO v_marc, v_bib_source
+      FROM  vandelay.queued_bib_record q
+            JOIN vandelay.bib_match m ON (m.queued_record = q.id AND q.id = import_id)
+      LIMIT 1;
+
+    IF v_marc IS NULL THEN
+        -- RAISE NOTICE 'no marc for vandelay or bib record';
+        RETURN FALSE;
+    END IF;
+
+    IF NOT vandelay.template_overlay_bib_record( v_marc, eg_id, merge_profile_id) THEN
+        -- no update happened, get outta here.
+        RETURN FALSE;
+    END IF;
+
+    UPDATE  vandelay.queued_bib_record
+      SET   imported_as = eg_id,
+            import_time = NOW()
+      WHERE id = import_id;
+
+    SELECT q.update_bib_source INTO update_bib_source 
+        FROM vandelay.merge_profile q where q.id = merge_profile_Id;
+
+    IF update_bib_source AND v_bib_source IS NOT NULL THEN
+        update_fields := ARRAY_APPEND(update_fields, 'source = ' || v_bib_source);
+    END IF;
+
+    SELECT q.update_bib_editor INTO update_bib_editor 
+        FROM vandelay.merge_profile q where q.id = merge_profile_Id;
+
+    IF update_bib_editor THEN
+
+        editor_string := (oils_xpath('//*[@tag="905"]/*[@code="u"]/text()',v_marc))[1];
+
+        IF editor_string IS NOT NULL AND editor_string <> '' THEN
+            SELECT usr INTO editor_id FROM actor.card WHERE barcode = editor_string;
+
+            IF editor_id IS NULL THEN
+                SELECT id INTO editor_id FROM actor.usr WHERE usrname = editor_string;
+            END IF;
+
+            IF editor_id IS NOT NULL THEN
+                --only update the edit date if we have a valid editor
+                update_fields := ARRAY_APPEND(
+                    update_fields, 'editor = ' || editor_id || ', edit_date = NOW()');
+            END IF;
+        END IF;
+    END IF;
+
+    IF ARRAY_LENGTH(update_fields, 1) > 0 THEN
+        update_query := 'UPDATE biblio.record_entry SET ' || 
+            ARRAY_TO_STRING(update_fields, ',') || ' WHERE id = ' || eg_id || ';';
+        EXECUTE update_query;
+    END IF;
+
+    RETURN TRUE;
+END;
+$$ LANGUAGE PLPGSQL;
+
+COMMIT;
+

diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-update-edit-date.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-update-edit-date.sql
deleted file mode 100644 (file)
index 44a3fed..0000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.vandelay-update-edit-date.sql
+++ /dev/null
@@ -1,84 +0,0 @@
-BEGIN;
-
--- SELECT evergreen.upgrade_deps_block_check('TODO', :eg_version);
-
-ALTER TABLE vandelay.merge_profile
-    ADD COLUMN update_bib_editor BOOLEAN NOT NULL DEFAULT FALSE;
-
--- By default, updating bib source means updating the editor.
-UPDATE vandelay.merge_profile SET update_bib_editor = update_bib_source;
-
-CREATE OR REPLACE FUNCTION vandelay.overlay_bib_record 
-    ( import_id BIGINT, eg_id BIGINT, merge_profile_id INT ) RETURNS BOOL AS $$
-DECLARE
-    editor_string   TEXT;
-    editor_id       INT;
-    v_marc          TEXT;
-    v_bib_source    INT;
-    update_fields   TEXT[];
-    update_query    TEXT;
-    update_bib_source BOOL;
-    update_bib_editor BOOL;
-BEGIN
-
-    SELECT  q.marc, q.bib_source INTO v_marc, v_bib_source
-      FROM  vandelay.queued_bib_record q
-            JOIN vandelay.bib_match m ON (m.queued_record = q.id AND q.id = import_id)
-      LIMIT 1;
-
-    IF v_marc IS NULL THEN
-        -- RAISE NOTICE 'no marc for vandelay or bib record';
-        RETURN FALSE;
-    END IF;
-
-    IF NOT vandelay.template_overlay_bib_record( v_marc, eg_id, merge_profile_id) THEN
-        -- no update happened, get outta here.
-        RETURN FALSE;
-    END IF;
-
-    UPDATE  vandelay.queued_bib_record
-      SET   imported_as = eg_id,
-            import_time = NOW()
-      WHERE id = import_id;
-
-    SELECT q.update_bib_source INTO update_bib_source 
-        FROM vandelay.merge_profile q where q.id = merge_profile_Id;
-
-    IF update_bib_source AND v_bib_source IS NOT NULL THEN
-        update_fields := ARRAY_APPEND(update_fields, 'source = ' || v_bib_source);
-    END IF;
-
-    SELECT q.update_bib_editor INTO update_bib_editor 
-        FROM vandelay.merge_profile q where q.id = merge_profile_Id;
-
-    IF update_bib_editor THEN
-
-        editor_string := (oils_xpath('//*[@tag="905"]/*[@code="u"]/text()',v_marc))[1];
-
-        IF editor_string IS NOT NULL AND editor_string <> '' THEN
-            SELECT usr INTO editor_id FROM actor.card WHERE barcode = editor_string;
-
-            IF editor_id IS NULL THEN
-                SELECT id INTO editor_id FROM actor.usr WHERE usrname = editor_string;
-            END IF;
-
-            IF editor_id IS NOT NULL THEN
-                --only update the edit date if we have a valid editor
-                update_fields := ARRAY_APPEND(
-                    update_fields, 'editor = ' || editor_id || ', edit_date = NOW()');
-            END IF;
-        END IF;
-    END IF;
-
-    IF ARRAY_LENGTH(update_fields, 1) > 0 THEN
-        update_query := 'UPDATE biblio.record_entry SET ' || 
-            ARRAY_TO_STRING(update_fields, ',') || ' WHERE id = ' || eg_id || ';';
-        EXECUTE update_query;
-    END IF;
-
-    RETURN TRUE;
-END;
-$$ LANGUAGE PLPGSQL;
-
-COMMIT;
-