[open-ils-commits] [GIT] Evergreen ILS branch master updated. c9ee43297cd45ce35b7c7769b5e6d0c6d2ad8e25

[Evergreen Git]

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  c9ee43297cd45ce35b7c7769b5e6d0c6d2ad8e25 (commit)
      from  f48b1bc163c5ea83054f7ad23a50966aab59f039 (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 c9ee43297cd45ce35b7c7769b5e6d0c6d2ad8e25
Author: Jason Stephenson <jstephenson at mvlc.org>
Date:   Wed Feb 4 13:38:45 2015 -0500

    LP#1418164: Fix 0905.schema.user_currnet_normalize_heading.sql.
    
    We can't alter a table, enabling triggers in this case, while a
    table has trigger events pending.  We move the trigger enabling
    to outside the transaction to resolve this.
    
    Signed-off-by: Jason Stephenson <jstephenson at mvlc.org>
    Signed-off-by: Ben Shum <bshum at biblio.org>

diff --git a/Open-ILS/src/sql/Pg/upgrade/0905.schema.use_current_normalize_heading.sql b/Open-ILS/src/sql/Pg/upgrade/0905.schema.use_current_normalize_heading.sql
index 8edc0f9..f526bb7 100644
--- a/Open-ILS/src/sql/Pg/upgrade/0905.schema.use_current_normalize_heading.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0905.schema.use_current_normalize_heading.sql
@@ -108,10 +108,13 @@ ALTER TABLE authority.record_entry DISABLE TRIGGER map_thesaurus_to_control_set;
 
 UPDATE authority.record_entry SET id = id WHERE heading LIKE 'NOHEADING%';
 
+COMMIT;
+
+-- These need to happen outside of the transaction to avoid this:
+-- ERROR: cannot ALTER TABLE "record_entry" because it has pending trigger
+-- events
 ALTER TABLE authority.record_entry ENABLE TRIGGER a_marcxml_is_well_formed;
 ALTER TABLE authority.record_entry ENABLE TRIGGER aaa_auth_ingest_or_delete;
 ALTER TABLE authority.record_entry ENABLE TRIGGER b_maintain_901;
 ALTER TABLE authority.record_entry ENABLE TRIGGER c_maintain_control_numbers;
 ALTER TABLE authority.record_entry ENABLE TRIGGER map_thesaurus_to_control_set;
-
-COMMIT;

-----------------------------------------------------------------------

Summary of changes:
 .../0905.schema.use_current_normalize_heading.sql  |    7 +++++--
 1 files changed, 5 insertions(+), 2 deletions(-)


hooks/post-receive
-- 
Evergreen ILS