From 517ebc136aa30869a26505d90470c38b2ec3be9f Mon Sep 17 00:00:00 2001 From: Dan Scott Date: Sat, 11 Jun 2011 07:05:53 -0400 Subject: [PATCH] Update upgrade files that had conflicting numbers 0549 and 0550 were taken by other commits over time. Signed-off-by: Dan Scott --- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- .../sql/Pg/upgrade/0551.unnest_metabib_remap_metarecord_for_bib.sql | 2 +- .../src/sql/Pg/upgrade/0552.unnest_biblio_map_authority_linking.sql | 2 +- .../sql/Pg/upgrade/0553.unnest_action_hold_request_permit_test.sql | 2 +- Open-ILS/src/sql/Pg/upgrade/0554.unnest_search_query_parser_fts.sql | 2 +- ...9.unnest_oils_xpath_table.sql => 0555.unnest_oils_xpath_table.sql} | 4 ++-- ...d_entry.sql => 0556.unnest_biblio_extract_metabib_field_entry.sql} | 4 ++-- 7 files changed, 9 insertions(+), 9 deletions(-) rename Open-ILS/src/sql/Pg/upgrade/{0549.unnest_oils_xpath_table.sql => 0555.unnest_oils_xpath_table.sql} (94%) rename Open-ILS/src/sql/Pg/upgrade/{0550.unnest_biblio_extract_metabib_field_entry.sql => 0556.unnest_biblio_extract_metabib_field_entry.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 017fe790c0..f5e60e9eca 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -57,7 +57,7 @@ CREATE TABLE config.upgrade_log ( install_date TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW() ); -INSERT INTO config.upgrade_log (version) VALUES ('0554'); -- dbs +INSERT INTO config.upgrade_log (version) VALUES ('0556'); -- dbs CREATE TABLE config.bib_source ( id SERIAL PRIMARY KEY, diff --git a/Open-ILS/src/sql/Pg/upgrade/0551.unnest_metabib_remap_metarecord_for_bib.sql b/Open-ILS/src/sql/Pg/upgrade/0551.unnest_metabib_remap_metarecord_for_bib.sql index 2b1cd642e1..b61a63a3c7 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0551.unnest_metabib_remap_metarecord_for_bib.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0551.unnest_metabib_remap_metarecord_for_bib.sql @@ -4,7 +4,7 @@ -- BEGIN; -INSERT INTO config.upgrade_log (version) VALUES ('0550'); -- dbs +INSERT INTO config.upgrade_log (version) VALUES ('0551'); -- dbs CREATE OR REPLACE FUNCTION metabib.remap_metarecord_for_bib( bib_id BIGINT, fp TEXT ) RETURNS BIGINT AS $func$ DECLARE diff --git a/Open-ILS/src/sql/Pg/upgrade/0552.unnest_biblio_map_authority_linking.sql b/Open-ILS/src/sql/Pg/upgrade/0552.unnest_biblio_map_authority_linking.sql index 180befaee7..af7db580ca 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0552.unnest_biblio_map_authority_linking.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0552.unnest_biblio_map_authority_linking.sql @@ -4,7 +4,7 @@ -- BEGIN; -INSERT INTO config.upgrade_log (version) VALUES ('0550'); -- dbs +INSERT INTO config.upgrade_log (version) VALUES ('0552'); -- dbs CREATE OR REPLACE FUNCTION biblio.map_authority_linking (bibid BIGINT, marc TEXT) RETURNS BIGINT AS $func$ DELETE FROM authority.bib_linking WHERE bib = $1; diff --git a/Open-ILS/src/sql/Pg/upgrade/0553.unnest_action_hold_request_permit_test.sql b/Open-ILS/src/sql/Pg/upgrade/0553.unnest_action_hold_request_permit_test.sql index b01ea971c7..001f38a0be 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0553.unnest_action_hold_request_permit_test.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0553.unnest_action_hold_request_permit_test.sql @@ -4,7 +4,7 @@ -- BEGIN; -INSERT INTO config.upgrade_log (version) VALUES ('0550'); -- dbs +INSERT INTO config.upgrade_log (version) VALUES ('0553'); -- dbs CREATE OR REPLACE FUNCTION action.hold_request_permit_test( pickup_ou INT, request_ou INT, match_item BIGINT, match_user INT, match_requestor INT, retargetting BOOL ) RETURNS SETOF action.matrix_test_result AS $func$ DECLARE diff --git a/Open-ILS/src/sql/Pg/upgrade/0554.unnest_search_query_parser_fts.sql b/Open-ILS/src/sql/Pg/upgrade/0554.unnest_search_query_parser_fts.sql index 7482088a3f..498a98d0ea 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0554.unnest_search_query_parser_fts.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0554.unnest_search_query_parser_fts.sql @@ -4,7 +4,7 @@ -- BEGIN; -INSERT INTO config.upgrade_log (version) VALUES ('0550'); -- dbs +INSERT INTO config.upgrade_log (version) VALUES ('0554'); -- dbs CREATE OR REPLACE FUNCTION search.query_parser_fts ( diff --git a/Open-ILS/src/sql/Pg/upgrade/0549.unnest_oils_xpath_table.sql b/Open-ILS/src/sql/Pg/upgrade/0555.unnest_oils_xpath_table.sql similarity index 94% rename from Open-ILS/src/sql/Pg/upgrade/0549.unnest_oils_xpath_table.sql rename to Open-ILS/src/sql/Pg/upgrade/0555.unnest_oils_xpath_table.sql index 8449a20e3a..ca95f31c13 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0549.unnest_oils_xpath_table.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0555.unnest_oils_xpath_table.sql @@ -1,10 +1,10 @@ --- Evergreen DB patch 0549.unnest_oils_xpath_table.sql +-- Evergreen DB patch 0555.unnest_oils_xpath_table.sql -- -- Replace usage of custom explode_array() function with native unnest() -- BEGIN; -INSERT INTO config.upgrade_log (version) VALUES ('0550'); -- dbs +INSERT INTO config.upgrade_log (version) VALUES ('0555'); -- dbs CREATE OR REPLACE FUNCTION oils_xpath_table ( key TEXT, document_field TEXT, relation_name TEXT, xpaths TEXT, criteria TEXT ) RETURNS SETOF RECORD AS $func$ DECLARE diff --git a/Open-ILS/src/sql/Pg/upgrade/0550.unnest_biblio_extract_metabib_field_entry.sql b/Open-ILS/src/sql/Pg/upgrade/0556.unnest_biblio_extract_metabib_field_entry.sql similarity index 96% rename from Open-ILS/src/sql/Pg/upgrade/0550.unnest_biblio_extract_metabib_field_entry.sql rename to Open-ILS/src/sql/Pg/upgrade/0556.unnest_biblio_extract_metabib_field_entry.sql index b3f1a7de55..473d61f63f 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0550.unnest_biblio_extract_metabib_field_entry.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0556.unnest_biblio_extract_metabib_field_entry.sql @@ -1,10 +1,10 @@ --- Evergreen DB patch 0550.unnest_biblio_extract_metabib_field_entry.sql +-- Evergreen DB patch 0556.unnest_biblio_extract_metabib_field_entry.sql -- -- Replace usage of custom explode_array() function with native unnest() -- BEGIN; -INSERT INTO config.upgrade_log (version) VALUES ('0550'); -- dbs +INSERT INTO config.upgrade_log (version) VALUES ('0556'); -- dbs CREATE OR REPLACE FUNCTION biblio.extract_metabib_field_entry ( rid BIGINT, default_joiner TEXT ) RETURNS SETOF metabib.field_entry_template AS $func$ DECLARE -- 2.11.0