From 50600776185d1e083d80eaa93a924a96ee9ae8d2 Mon Sep 17 00:00:00 2001
From: Mike Rylander <mrylander@gmail.com>
Date: Tue, 15 Nov 2011 15:45:02 -0500
Subject: [PATCH] Stamped upgrade for asset.merge_record_assets fix
Signed-off-by: Mike Rylander <mrylander@gmail.com>
---
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
...cq.sql => 0648.function.merge_record_assets_meets_acq.sql} | 11 +++++++++++
2 files changed, 12 insertions(+), 1 deletion(-)
rename Open-ILS/src/sql/Pg/upgrade/{XXXX.function.merge_record_assets_meets_acq.sql => 0648.function.merge_record_assets_meets_acq.sql} (97%)
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 2a45321d3b..db5e247f06 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -86,7 +86,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 ('0647', :eg_version); -- berick/miker
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0648', :eg_version); -- phasefx/miker
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.function.merge_record_assets_meets_acq.sql b/Open-ILS/src/sql/Pg/upgrade/0648.function.merge_record_assets_meets_acq.sql
similarity index 97%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.function.merge_record_assets_meets_acq.sql
rename to Open-ILS/src/sql/Pg/upgrade/0648.function.merge_record_assets_meets_acq.sql
index b2992d9d6d..8f7b8e2e2d 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.function.merge_record_assets_meets_acq.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0648.function.merge_record_assets_meets_acq.sql
@@ -1,3 +1,11 @@
+-- Evergreen DB patch 0648.function.merge_record_assets_meets_acq.sql
+--
+BEGIN;
+
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('0648', :eg_version);
+
CREATE OR REPLACE FUNCTION asset.merge_record_assets( target_record BIGINT, source_record BIGINT ) RETURNS INT AS $func$
DECLARE
moved_objects INT := 0;
@@ -250,3 +258,6 @@ END;
$func$ LANGUAGE plpgsql;
+
+
+COMMIT;
--
2.11.0