From 9c344376f62ddb4a917c5e8894ab8f909e4af5ba Mon Sep 17 00:00:00 2001 From: Mike Rylander Date: Thu, 13 Oct 2011 15:57:30 -0400 Subject: [PATCH] Stamping upgrade for asset.merge_record_assets fix from dbs Signed-off-by: Mike Rylander --- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- ...e_record_assets.sql => 0639.schema.asset_merge_record_assets.sql} | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) rename Open-ILS/src/sql/Pg/upgrade/{XXXX.schema.asset_merge_record_assets.sql => 0639.schema.asset_merge_record_assets.sql} (96%) diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index 9cbebb2ab9..f8f9baa51b 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 ('0638', :eg_version); -- miker +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0639', :eg_version); -- dbs/miker CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.asset_merge_record_assets.sql b/Open-ILS/src/sql/Pg/upgrade/0639.schema.asset_merge_record_assets.sql similarity index 96% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.asset_merge_record_assets.sql rename to Open-ILS/src/sql/Pg/upgrade/0639.schema.asset_merge_record_assets.sql index 619adc925f..41892d4d6a 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.asset_merge_record_assets.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0639.schema.asset_merge_record_assets.sql @@ -1,14 +1,11 @@ -- Evergreen DB patch XXXX.schema.asset_merge_record_assets.sql -- --- FIXME: insert description of change, if needed -- BEGIN; -- check whether patch can be applied -SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); - --- FIXME: add/check SQL statements to perform the upgrade +SELECT evergreen.upgrade_deps_block_check('0639', :eg_version); CREATE OR REPLACE FUNCTION asset.merge_record_assets( target_record BIGINT, source_record BIGINT ) RETURNS INT AS $func$ DECLARE -- 2.11.0