From ab685448207ea0ae99b9c954d600090a44d5e640 Mon Sep 17 00:00:00 2001 From: Dan Wells Date: Wed, 30 Oct 2013 15:33:28 -0400 Subject: [PATCH] Stamping 0846: overlay subfield order fix Respect source XML subfield order during overlay Signed-off-by: Dan Wells --- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- ...tion.vand-add_field.sql => 0846.function.vand-add_field.sql} | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) rename Open-ILS/src/sql/Pg/upgrade/{XXXX.function.vand-add_field.sql => 0846.function.vand-add_field.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 790e3947d3..e21d01fa55 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -91,7 +91,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 ('0845', :eg_version); -- dbwells/csharp +INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0846', :eg_version); -- eeevil/dbwells CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.function.vand-add_field.sql b/Open-ILS/src/sql/Pg/upgrade/0846.function.vand-add_field.sql similarity index 97% rename from Open-ILS/src/sql/Pg/upgrade/XXXX.function.vand-add_field.sql rename to Open-ILS/src/sql/Pg/upgrade/0846.function.vand-add_field.sql index 521395ecdc..eea8a306b7 100644 --- a/Open-ILS/src/sql/Pg/upgrade/XXXX.function.vand-add_field.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0846.function.vand-add_field.sql @@ -1,6 +1,6 @@ BEGIN; -SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version); +SELECT evergreen.upgrade_deps_block_check('0846', :eg_version); CREATE OR REPLACE FUNCTION vandelay.add_field ( target_xml TEXT, source_xml TEXT, field TEXT, force_add INT ) RETURNS TEXT AS $_$ -- 2.43.2