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

[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  0de2ebfce5ab86781c656f3385fd03f5eda25e2d (commit)
      from  ceabf2764cc095306ca1052652679c6d0d238561 (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 0de2ebfce5ab86781c656f3385fd03f5eda25e2d
Author: James Fournie <jfournie at sitka.bclibraries.ca>
Date:   Mon May 7 11:08:06 2012 -0700

    We can't assume that 0526 was in fact run previously so we need to drop these more safely
    to avoid producing an error if 0526 wasn't run previously
    
    Signed-off-by: James Fournie <jfournie at sitka.bclibraries.ca>
    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 c728c5a..4f8dff4 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
@@ -6,9 +6,9 @@
 -- DROP objects that might have existed from a prior run of 0526
 -- Yes this is ironic.
 DROP TABLE IF EXISTS config.db_patch_dependencies;
-ALTER TABLE config.upgrade_log DROP COLUMN applied_to;
-DROP FUNCTION evergreen.upgrade_list_applied_deprecates(TEXT);
-DROP FUNCTION evergreen.upgrade_list_applied_supersedes(TEXT);
+ALTER TABLE config.upgrade_log DROP COLUMN IF EXISTS applied_to;
+DROP FUNCTION IF EXISTS evergreen.upgrade_list_applied_deprecates(TEXT);
+DROP FUNCTION IF EXISTS evergreen.upgrade_list_applied_supersedes(TEXT);
 
 BEGIN;
 INSERT INTO config.upgrade_log (version) VALUES ('2.2-beta2');

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

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


hooks/post-receive
-- 
Evergreen ILS