[open-ils-commits] ***SPAM*** [GIT] Evergreen ILS branch master updated. e917670aee2da991e4a304a6cb9fbf4414372d1b
Evergreen Git
git at git.evergreen-ils.org
Thu Oct 10 13:34:00 EDT 2013
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Evergreen ILS".
The branch, master has been updated
via e917670aee2da991e4a304a6cb9fbf4414372d1b (commit)
via 04d34abdea1be88d54c2ba1cd42ea45d32e5afcf (commit)
via 6eaa123c11156ef6999cfb595e15368a63735dab (commit)
from d2bfda00482578e4496399c6d2569339c54f732d (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit e917670aee2da991e4a304a6cb9fbf4414372d1b
Author: Dan Wells <dbw2 at calvin.edu>
Date: Thu Oct 10 13:32:41 2013 -0400
Stamping 0841: make space in config.metabib_field sequence
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index bfecd9b..bed55d7 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 ('0840', :eg_version); -- gcollum/dyrcona
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0841', :eg_version); -- dbwells/senator
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/WWWW.schema.redo_config_metabib_field_sequence.sql b/Open-ILS/src/sql/Pg/upgrade/0841.schema.redo_config_metabib_field_sequence.sql
similarity index 97%
rename from Open-ILS/src/sql/Pg/upgrade/WWWW.schema.redo_config_metabib_field_sequence.sql
rename to Open-ILS/src/sql/Pg/upgrade/0841.schema.redo_config_metabib_field_sequence.sql
index 4ae300a..ef2b1ab 100644
--- a/Open-ILS/src/sql/Pg/upgrade/WWWW.schema.redo_config_metabib_field_sequence.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0841.schema.redo_config_metabib_field_sequence.sql
@@ -1,7 +1,7 @@
BEGIN;
-- check whether patch can be applied
---SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0841', :eg_version);
ALTER TABLE config.metabib_field_ts_map DROP CONSTRAINT metabib_field_ts_map_metabib_field_fkey;
ALTER TABLE config.metabib_search_alias DROP CONSTRAINT metabib_search_alias_field_fkey;
commit 04d34abdea1be88d54c2ba1cd42ea45d32e5afcf
Author: Dan Wells <dbw2 at calvin.edu>
Date: Wed Oct 9 09:38:21 2013 -0400
Upgrade script for config.metabib_field sequence redo
[LFW: s/DROP FUNCTION/DROP FUNCTION IF EXISTS/]
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/upgrade/WWWW.schema.redo_config_metabib_field_sequence.sql b/Open-ILS/src/sql/Pg/upgrade/WWWW.schema.redo_config_metabib_field_sequence.sql
new file mode 100644
index 0000000..4ae300a
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/WWWW.schema.redo_config_metabib_field_sequence.sql
@@ -0,0 +1,56 @@
+BEGIN;
+
+-- check whether patch can be applied
+--SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+ALTER TABLE config.metabib_field_ts_map DROP CONSTRAINT metabib_field_ts_map_metabib_field_fkey;
+ALTER TABLE config.metabib_search_alias DROP CONSTRAINT metabib_search_alias_field_fkey;
+ALTER TABLE config.z3950_index_field_map DROP CONSTRAINT z3950_index_field_map_metabib_field_fkey;
+ALTER TABLE metabib.browse_entry_def_map DROP CONSTRAINT browse_entry_def_map_def_fkey;
+
+ALTER TABLE config.metabib_field_ts_map ADD CONSTRAINT metabib_field_ts_map_metabib_field_fkey FOREIGN KEY (metabib_field) REFERENCES config.metabib_field(id) DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE config.metabib_search_alias ADD CONSTRAINT metabib_search_alias_field_fkey FOREIGN KEY (field) REFERENCES config.metabib_field(id) DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE config.z3950_index_field_map ADD CONSTRAINT z3950_index_field_map_metabib_field_fkey FOREIGN KEY (metabib_field) REFERENCES config.metabib_field(id) DEFERRABLE INITIALLY DEFERRED;
+ALTER TABLE metabib.browse_entry_def_map ADD CONSTRAINT browse_entry_def_map_def_fkey FOREIGN KEY (def) REFERENCES config.metabib_field(id) DEFERRABLE INITIALLY DEFERRED;
+
+
+DROP FUNCTION IF EXISTS config.modify_metabib_field(source INT, target INT);
+CREATE FUNCTION config.modify_metabib_field(v_source INT, target INT) RETURNS INT AS $func$
+DECLARE
+ f_class TEXT;
+ check_id INT;
+ target_id INT;
+BEGIN
+ SELECT field_class INTO f_class FROM config.metabib_field WHERE id = v_source;
+ IF NOT FOUND THEN
+ RETURN 0;
+ END IF;
+ IF target IS NULL THEN
+ target_id = v_source + 1000;
+ ELSE
+ target_id = target;
+ END IF;
+ SELECT id FROM config.metabib_field INTO check_id WHERE id = target_id;
+ IF FOUND THEN
+ RAISE NOTICE 'Cannot bump config.metabib_field.id from % to %; the target ID already exists.', v_source, target_id;
+ RETURN 0;
+ END IF;
+ UPDATE config.metabib_field SET id = target_id WHERE id = v_source;
+ EXECUTE ' UPDATE metabib.' || f_class || '_field_entry SET field = ' || target_id || ' WHERE field = ' || v_source;
+ UPDATE config.metabib_field_ts_map SET metabib_field = target_id WHERE metabib_field = v_source;
+ UPDATE config.metabib_field_index_norm_map SET field = target_id WHERE field = v_source;
+ UPDATE search.relevance_adjustment SET field = target_id WHERE field = v_source;
+ UPDATE config.metabib_search_alias SET field = target_id WHERE field = v_source;
+ UPDATE config.z3950_index_field_map SET metabib_field = target_id WHERE metabib_field = v_source;
+ UPDATE metabib.browse_entry_def_map SET def = target_id WHERE def = v_source;
+ RETURN 1;
+END;
+$func$ LANGUAGE PLPGSQL;
+
+SELECT config.modify_metabib_field(id, NULL)
+ FROM config.metabib_field
+ WHERE id > 30;
+
+SELECT SETVAL('config.metabib_field_id_seq', GREATEST(1000, (SELECT MAX(id) FROM config.metabib_field)));
+
+COMMIT;
commit 6eaa123c11156ef6999cfb595e15368a63735dab
Author: Dan Wells <dbw2 at calvin.edu>
Date: Wed Oct 9 09:29:01 2013 -0400
Make some FK constraints on config.metabib_field.id deferrable
Signed-off-by: Dan Wells <dbw2 at calvin.edu>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 6f68922..bfecd9b 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -239,7 +239,7 @@ $$;
CREATE TABLE config.metabib_field_ts_map (
id SERIAL PRIMARY KEY,
- metabib_field INT NOT NULL REFERENCES config.metabib_field (id),
+ metabib_field INT NOT NULL REFERENCES config.metabib_field (id) DEFERRABLE INITIALLY DEFERRED,
ts_config TEXT NOT NULL REFERENCES config.ts_config_list (id),
active BOOL NOT NULL DEFAULT TRUE,
index_weight CHAR(1) NOT NULL DEFAULT 'C' CHECK (index_weight IN ('A','B','C','D')),
@@ -256,7 +256,7 @@ $$;
CREATE TABLE config.metabib_search_alias (
alias TEXT PRIMARY KEY,
field_class TEXT NOT NULL REFERENCES config.metabib_class (name),
- field INT REFERENCES config.metabib_field (id)
+ field INT REFERENCES config.metabib_field (id) DEFERRABLE INITIALLY DEFERRED
);
CREATE TABLE config.non_cataloged_type (
@@ -1056,7 +1056,7 @@ $$;
CREATE TABLE config.z3950_index_field_map (
id SERIAL PRIMARY KEY,
label TEXT NOT NULL, -- i18n
- metabib_field INTEGER REFERENCES config.metabib_field(id),
+ metabib_field INTEGER REFERENCES config.metabib_field(id) DEFERRABLE INITIALLY DEFERRED,
record_attr TEXT REFERENCES config.record_attr_definition(name),
z3950_attr INTEGER REFERENCES config.z3950_attr(id),
z3950_attr_type TEXT,-- REFERENCES config.z3950_attr(name)
diff --git a/Open-ILS/src/sql/Pg/030.schema.metabib.sql b/Open-ILS/src/sql/Pg/030.schema.metabib.sql
index 9cf1ed8..73b30ea 100644
--- a/Open-ILS/src/sql/Pg/030.schema.metabib.sql
+++ b/Open-ILS/src/sql/Pg/030.schema.metabib.sql
@@ -204,7 +204,7 @@ CREATE TRIGGER metabib_browse_entry_fti_trigger
CREATE TABLE metabib.browse_entry_def_map (
id BIGSERIAL PRIMARY KEY,
entry BIGINT REFERENCES metabib.browse_entry (id),
- def INT REFERENCES config.metabib_field (id),
+ def INT REFERENCES config.metabib_field (id) DEFERRABLE INITIALLY DEFERRED,
source BIGINT REFERENCES biblio.record_entry (id),
authority BIGINT REFERENCES authority.record_entry (id) ON DELETE SET NULL
);
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 8 ++--
Open-ILS/src/sql/Pg/030.schema.metabib.sql | 2 +-
...1.schema.redo_config_metabib_field_sequence.sql | 56 ++++++++++++++++++++
3 files changed, 61 insertions(+), 5 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/0841.schema.redo_config_metabib_field_sequence.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list