From: Jason Stephenson <jstephenson@mvlc.org>
Date: Thu, 1 Aug 2013 19:27:18 +0000 (-0400)
Subject: Stamping upgrade script for LP1204273.
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=72e2f9378361f990636e025d96b43e80a7967f50;p=evergreen%2Fequinox.git

Stamping upgrade script for LP1204273.

Repair org unit settings for making state not required

Signed-off-by: Jason Stephenson <jstephenson@mvlc.org>
---

diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index 8e8968ff71..0211ae65c5 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -91,7 +91,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 ('0812', :eg_version); -- dbs/kmlussier
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0813', :eg_version); -- bshum/Dyrcona
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/0813.data.state-field-settings-fix.sql b/Open-ILS/src/sql/Pg/upgrade/0813.data.state-field-settings-fix.sql
new file mode 100644
index 0000000000..071b26ecbe
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0813.data.state-field-settings-fix.sql
@@ -0,0 +1,29 @@
+BEGIN;
+
+SELECT evergreen.upgrade_deps_block_check('0813', :eg_version);
+
+-- Don't require state in the auditor tracking for user addresses
+
+ALTER TABLE auditor.actor_usr_address_history ALTER COLUMN state DROP NOT NULL;
+
+-- Change constraint on actor.org_unit_setting_log to be deferrable initially
+
+ALTER TABLE config.org_unit_setting_type_log
+  DROP CONSTRAINT org_unit_setting_type_log_field_name_fkey,
+  ADD CONSTRAINT org_unit_setting_type_log_field_name_fkey FOREIGN KEY (field_name)
+    REFERENCES config.org_unit_setting_type (name) MATCH SIMPLE
+    ON UPDATE NO ACTION ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED;
+
+-- Fix names in the org unit setting configuration
+
+UPDATE config.org_unit_setting_type SET name = overlay(name placing 'aua' from 16 for 2) where name like 'ui.patron.edit.au.state.%';
+
+-- Fix names if they have already been set in the editor
+
+UPDATE actor.org_unit_setting SET name = overlay(name placing 'aua' from 16 for 2) where name like 'ui.patron.edit.au.state.%';
+
+-- and the logs too
+
+UPDATE config.org_unit_setting_type_log SET field_name = overlay(field_name placing 'aua' from 16 for 2) where field_name like 'ui.patron.edit.au.state.%';
+
+COMMIT;
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.state-field-settings-fix.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.data.state-field-settings-fix.sql
deleted file mode 100644
index f4fd4f6a4f..0000000000
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.data.state-field-settings-fix.sql
+++ /dev/null
@@ -1,29 +0,0 @@
-BEGIN;
-
--- SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
-
--- Don't require state in the auditor tracking for user addresses
-
-ALTER TABLE auditor.actor_usr_address_history ALTER COLUMN state DROP NOT NULL;
-
--- Change constraint on actor.org_unit_setting_log to be deferrable initially
-
-ALTER TABLE config.org_unit_setting_type_log
-  DROP CONSTRAINT org_unit_setting_type_log_field_name_fkey,
-  ADD CONSTRAINT org_unit_setting_type_log_field_name_fkey FOREIGN KEY (field_name)
-    REFERENCES config.org_unit_setting_type (name) MATCH SIMPLE
-    ON UPDATE NO ACTION ON DELETE NO ACTION DEFERRABLE INITIALLY DEFERRED;
-
--- Fix names in the org unit setting configuration
-
-UPDATE config.org_unit_setting_type SET name = overlay(name placing 'aua' from 16 for 2) where name like 'ui.patron.edit.au.state.%';
-
--- Fix names if they have already been set in the editor
-
-UPDATE actor.org_unit_setting SET name = overlay(name placing 'aua' from 16 for 2) where name like 'ui.patron.edit.au.state.%';
-
--- and the logs too
-
-UPDATE config.org_unit_setting_type_log SET field_name = overlay(field_name placing 'aua' from 16 for 2) where field_name like 'ui.patron.edit.au.state.%';
-
-COMMIT;