[open-ils-commits] [GIT] Evergreen ILS branch rel_2_2 updated. 7f46dc3ada677bbfdd056e3da6dd01e7482abb51

[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, rel_2_2 has been updated
       via  7f46dc3ada677bbfdd056e3da6dd01e7482abb51 (commit)
      from  749de68d7d24f4007095149c7b90d090b782ab8a (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 7f46dc3ada677bbfdd056e3da6dd01e7482abb51
Author: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>
Date:   Thu May 10 16:19:26 2012 -0400

    In the 2.1-2.2 upgrade script, move 0691 into a failures-are-ok zone
    
    Mainly because it's already covered in the 2.1.1-2.1.2 upgrade script.
    Thanks to George Duimovich for pointing this out in LP #997759.
    
    Signed-off-by: Lebbeous Fogle-Weekley <lebbeous at esilibrary.com>

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
index de6d5c5..5b369e7 100644
--- a/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql
@@ -11505,19 +11505,6 @@ EXPLAIN ANALYZE SELECT unapi.bre(36,'marcxml','record','{holdings_xml,mra,acp,ac
 */
 
 
-SELECT evergreen.upgrade_deps_block_check('0691', :eg_version);
-
-CREATE INDEX poi_po_idx ON acq.po_item (purchase_order);
-
-CREATE INDEX ie_inv_idx on acq.invoice_entry (invoice);
-CREATE INDEX ie_po_idx on acq.invoice_entry (purchase_order);
-CREATE INDEX ie_li_idx on acq.invoice_entry (lineitem);
-
-CREATE INDEX ii_inv_idx on acq.invoice_item (invoice);
-CREATE INDEX ii_po_idx on acq.invoice_item (purchase_order);
-CREATE INDEX ii_poi_idx on acq.invoice_item (po_item);
-
-
 SELECT evergreen.upgrade_deps_block_check('0692', :eg_version);
 
 INSERT INTO config.org_unit_setting_type
@@ -16141,3 +16128,22 @@ SELECT metabib.reingest_metabib_field_entries(source)
 
 COMMIT;
 
+-- outside of any transaction
+
+\qecho ************************************************************************
+\qecho                  Failures from here down are okay!
+\qecho ************************************************************************
+
+SELECT evergreen.upgrade_deps_block_check('0691', :eg_version);
+
+CREATE INDEX poi_po_idx ON acq.po_item (purchase_order);
+
+CREATE INDEX ie_inv_idx on acq.invoice_entry (invoice);
+CREATE INDEX ie_po_idx on acq.invoice_entry (purchase_order);
+CREATE INDEX ie_li_idx on acq.invoice_entry (lineitem);
+
+CREATE INDEX ii_inv_idx on acq.invoice_item (invoice);
+CREATE INDEX ii_po_idx on acq.invoice_item (purchase_order);
+CREATE INDEX ii_poi_idx on acq.invoice_item (po_item);
+
+

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

Summary of changes:
 .../sql/Pg/version-upgrade/2.1-2.2-upgrade-db.sql  |   32 ++++++++++++--------
 1 files changed, 19 insertions(+), 13 deletions(-)


hooks/post-receive
-- 
Evergreen ILS