[open-ils-commits] [GIT] Evergreen ILS branch rel_3_0 updated. ddc2021006cce2123085eab352d878fe1e812469
Evergreen Git
git at git.evergreen-ils.org
Thu Nov 9 10:25:13 EST 2017
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, rel_3_0 has been updated
via ddc2021006cce2123085eab352d878fe1e812469 (commit)
via 46924dd20a681e1fb91ad90f39bc0ef74e5dfa05 (commit)
via ab7e59152a2e6f00a3e7af477ac268e3dc97da8b (commit)
from 290a5f7eff55eb5e0addf26399e3efac5725c628 (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 ddc2021006cce2123085eab352d878fe1e812469
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Thu Nov 9 10:44:17 2017 -0500
LP#1724223: stamp schema update
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index fa42ac4..83c9c48 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -92,7 +92,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 ('1080', :eg_version); -- miker/jboyer/gmcharlt
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('1081', :eg_version); -- jboyer/gmcharlt
CREATE TABLE config.bib_source (
id SERIAL PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1724223-re-inherited.sql b/Open-ILS/src/sql/Pg/upgrade/1081.schema.lp1724223-re-inherited.sql
similarity index 93%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1724223-re-inherited.sql
rename to Open-ILS/src/sql/Pg/upgrade/1081.schema.lp1724223-re-inherited.sql
index d807710..f2a5fe8 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1724223-re-inherited.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/1081.schema.lp1724223-re-inherited.sql
@@ -1,6 +1,6 @@
BEGIN;
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('1081', :eg_version); -- jboyer/gmcharlt
DROP TRIGGER IF EXISTS inherit_copy_bucket_item_target_copy_fkey ON container.copy_bucket_item;
DROP TRIGGER IF EXISTS inherit_import_item_imported_as_fkey ON vandelay.import_item;
commit 46924dd20a681e1fb91ad90f39bc0ef74e5dfa05
Author: Galen Charlton <gmc at equinoxinitiative.org>
Date: Thu Nov 9 10:37:52 2017 -0500
LP#1724223: tweak upgrade script
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1724223-re-inherited.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1724223-re-inherited.sql
index 35c3686..d807710 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1724223-re-inherited.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1724223-re-inherited.sql
@@ -5,7 +5,7 @@ SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
DROP TRIGGER IF EXISTS inherit_copy_bucket_item_target_copy_fkey ON container.copy_bucket_item;
DROP TRIGGER IF EXISTS inherit_import_item_imported_as_fkey ON vandelay.import_item;
DROP TRIGGER IF EXISTS inherit_asset_copy_note_copy_fkey ON asset.copy_note;
-DROP TRIGGER inherit_asset_copy_tag_copy_map_copy_fkey ON asset.copy_tag_copy_map;
+DROP TRIGGER IF EXISTS inherit_asset_copy_tag_copy_map_copy_fkey ON asset.copy_tag_copy_map;
CREATE CONSTRAINT TRIGGER inherit_copy_bucket_item_target_copy_fkey
AFTER UPDATE OR INSERT ON container.copy_bucket_item
commit ab7e59152a2e6f00a3e7af477ac268e3dc97da8b
Author: Jason Boyer <JBoyer at library.in.gov>
Date: Tue Oct 17 22:10:46 2017 -0500
LP1724223: Fix inherited FKEY triggers
When running these triggers on TG_OP=DELETE they
always fail and prevent the delete. Skipping the
triggers on DELETE allows things to continue as
usual.
To test
-------
Verify that after applying the patch that you can remove
notes and copy tags from copies and copies from buckets
and Vandely import queues.
Signed-off-by: Jason Boyer <JBoyer at library.in.gov>
Signed-off-by: Galen Charlton <gmc at equinoxinitiative.org>
diff --git a/Open-ILS/src/sql/Pg/070.schema.container.sql b/Open-ILS/src/sql/Pg/070.schema.container.sql
index b3a3056..594dfaf 100644
--- a/Open-ILS/src/sql/Pg/070.schema.container.sql
+++ b/Open-ILS/src/sql/Pg/070.schema.container.sql
@@ -75,7 +75,7 @@ END;
$f$ LANGUAGE PLPGSQL VOLATILE COST 50;
CREATE CONSTRAINT TRIGGER inherit_copy_bucket_item_target_copy_fkey
- AFTER UPDATE OR INSERT OR DELETE ON container.copy_bucket_item
+ AFTER UPDATE OR INSERT ON container.copy_bucket_item
DEFERRABLE FOR EACH ROW EXECUTE PROCEDURE evergreen.container_copy_bucket_item_target_copy_inh_fkey();
diff --git a/Open-ILS/src/sql/Pg/800.fkeys.sql b/Open-ILS/src/sql/Pg/800.fkeys.sql
index 13129f5..5835ee3 100644
--- a/Open-ILS/src/sql/Pg/800.fkeys.sql
+++ b/Open-ILS/src/sql/Pg/800.fkeys.sql
@@ -124,7 +124,7 @@ END;
$f$ LANGUAGE PLPGSQL VOLATILE COST 50;
CREATE CONSTRAINT TRIGGER inherit_import_item_imported_as_fkey
- AFTER UPDATE OR INSERT OR DELETE ON vandelay.import_item
+ AFTER UPDATE OR INSERT ON vandelay.import_item
DEFERRABLE FOR EACH ROW EXECUTE PROCEDURE evergreen.vandelay_import_item_imported_as_inh_fkey();
ALTER TABLE vandelay.bib_queue ADD CONSTRAINT match_bucket_fkey FOREIGN KEY (match_bucket) REFERENCES container.biblio_record_entry_bucket(id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED;
@@ -142,7 +142,7 @@ END;
$f$ LANGUAGE PLPGSQL VOLATILE COST 50;
CREATE CONSTRAINT TRIGGER inherit_asset_copy_note_copy_fkey
- AFTER UPDATE OR INSERT OR DELETE ON asset.copy_note
+ AFTER UPDATE OR INSERT ON asset.copy_note
DEFERRABLE FOR EACH ROW EXECUTE PROCEDURE evergreen.asset_copy_note_owning_copy_inh_fkey();
CREATE OR REPLACE FUNCTION evergreen.asset_copy_tag_copy_map_copy_inh_fkey() RETURNS TRIGGER AS $f$
@@ -158,7 +158,7 @@ END;
$f$ LANGUAGE PLPGSQL VOLATILE COST 50;
CREATE CONSTRAINT TRIGGER inherit_asset_copy_tag_copy_map_copy_fkey
- AFTER UPDATE OR INSERT OR DELETE ON asset.copy_tag_copy_map
+ AFTER UPDATE OR INSERT ON asset.copy_tag_copy_map
DEFERRABLE FOR EACH ROW EXECUTE PROCEDURE evergreen.asset_copy_tag_copy_map_copy_inh_fkey();
ALTER TABLE asset.copy_note ADD CONSTRAINT asset_copy_note_creator_fkey FOREIGN KEY (creator) REFERENCES actor.usr (id) ON DELETE SET NULL DEFERRABLE INITIALLY DEFERRED;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1724223-re-inherited.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1724223-re-inherited.sql
new file mode 100644
index 0000000..35c3686
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.lp1724223-re-inherited.sql
@@ -0,0 +1,24 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+DROP TRIGGER IF EXISTS inherit_copy_bucket_item_target_copy_fkey ON container.copy_bucket_item;
+DROP TRIGGER IF EXISTS inherit_import_item_imported_as_fkey ON vandelay.import_item;
+DROP TRIGGER IF EXISTS inherit_asset_copy_note_copy_fkey ON asset.copy_note;
+DROP TRIGGER inherit_asset_copy_tag_copy_map_copy_fkey ON asset.copy_tag_copy_map;
+
+CREATE CONSTRAINT TRIGGER inherit_copy_bucket_item_target_copy_fkey
+ AFTER UPDATE OR INSERT ON container.copy_bucket_item
+ DEFERRABLE FOR EACH ROW EXECUTE PROCEDURE evergreen.container_copy_bucket_item_target_copy_inh_fkey();
+CREATE CONSTRAINT TRIGGER inherit_import_item_imported_as_fkey
+ AFTER UPDATE OR INSERT ON vandelay.import_item
+ DEFERRABLE FOR EACH ROW EXECUTE PROCEDURE evergreen.vandelay_import_item_imported_as_inh_fkey();
+CREATE CONSTRAINT TRIGGER inherit_asset_copy_note_copy_fkey
+ AFTER UPDATE OR INSERT ON asset.copy_note
+ DEFERRABLE FOR EACH ROW EXECUTE PROCEDURE evergreen.asset_copy_note_owning_copy_inh_fkey();
+CREATE CONSTRAINT TRIGGER inherit_asset_copy_tag_copy_map_copy_fkey
+ AFTER UPDATE OR INSERT ON asset.copy_tag_copy_map
+ DEFERRABLE FOR EACH ROW EXECUTE PROCEDURE evergreen.asset_copy_tag_copy_map_copy_inh_fkey();
+
+COMMIT;
+
-----------------------------------------------------------------------
Summary of changes:
Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +-
Open-ILS/src/sql/Pg/070.schema.container.sql | 2 +-
Open-ILS/src/sql/Pg/800.fkeys.sql | 6 ++--
.../upgrade/1081.schema.lp1724223-re-inherited.sql | 24 ++++++++++++++++++++
4 files changed, 29 insertions(+), 5 deletions(-)
create mode 100644 Open-ILS/src/sql/Pg/upgrade/1081.schema.lp1724223-re-inherited.sql
hooks/post-receive
--
Evergreen ILS
More information about the open-ils-commits
mailing list