From f16fc8bf38aa7143884418a2b208bdd03c8b5e34 Mon Sep 17 00:00:00 2001
From: Dan Scott <dscott@laurentian.ca>
Date: Wed, 26 Sep 2012 22:11:45 -0400
Subject: [PATCH] Apply the 0715 update during the 2.3.0 upgrade

Per LP# 1057183, the 0715 update should have been applied during the
2.1-2.2 upgrade, but appears not to have been - and that ends up
causing problems during the 2.2-2.3 upgrade. Thus we prophylactically
attempt to apply it again.

Signed-off-by: Dan Scott <dscott@laurentian.ca>
Signed-off-by: Lebbeous Fogle-Weekley <lebbeous@esilibrary.com>
---
 .../src/sql/Pg/version-upgrade/2.2-2.3.0-upgrade-db.sql    | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/Open-ILS/src/sql/Pg/version-upgrade/2.2-2.3.0-upgrade-db.sql b/Open-ILS/src/sql/Pg/version-upgrade/2.2-2.3.0-upgrade-db.sql
index b3ac362b96..4d8b87bbc3 100644
--- a/Open-ILS/src/sql/Pg/version-upgrade/2.2-2.3.0-upgrade-db.sql
+++ b/Open-ILS/src/sql/Pg/version-upgrade/2.2-2.3.0-upgrade-db.sql
@@ -2,6 +2,20 @@
 
 \set eg_version '''2.3.0'''
 
+\qecho The following statement might fail, and that is okay; we are
+\qecho ensuring that an upgrade that should have been applied during
+\qecho the 2.2 upgrade is actually applied now.
+
+-- 0715.data.add_acq_config_group
+INSERT INTO config.settings_group (name, label) VALUES
+('acq', oils_i18n_gettext('config.settings_group.system', 'Acquisitions', 'coust', 'label'));
+
+UPDATE config.org_unit_setting_type
+    SET grp = 'acq'
+    WHERE name LIKE 'acq%';
+
+\qecho The real upgrade begins now.
+
 BEGIN;
 INSERT INTO config.upgrade_log (version, applied_to) VALUES ('2.3.0', :eg_version);
 -- Evergreen DB patch 0703.tpac_value_maps.sql
-- 
2.11.0