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

[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  30fa94a8d64250e336b4f2b56b2901414fcc6323 (commit)
       via  e4b1f26c84f090b1ccc2c56681ac3bff40e1b7d8 (commit)
      from  7114a6b284d57814a7937741d3afac97025ab917 (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 30fa94a8d64250e336b4f2b56b2901414fcc6323
Author: Thomas Berezansky <tsbere at mvlc.org>
Date:   Tue Oct 18 10:07:08 2011 -0400

    Stamping upgrade script for LP#847973
    
    Signed-off-by: Thomas Berezansky <tsbere at 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 946150d..acccf52 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -86,7 +86,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 ('0640', :eg_version); -- miker/lebbeous/berick
+INSERT INTO config.upgrade_log (version, applied_to) VALUES ('0641', :eg_version); -- tsbere/phasefx
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.org_unit_setting_json_check.sql b/Open-ILS/src/sql/Pg/upgrade/0641.schema.org_unit_setting_json_check.sql
similarity index 56%
rename from Open-ILS/src/sql/Pg/upgrade/XXXX.schema.org_unit_setting_json_check.sql
rename to Open-ILS/src/sql/Pg/upgrade/0641.schema.org_unit_setting_json_check.sql
index 0e96020..a23e154 100644
--- a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.org_unit_setting_json_check.sql
+++ b/Open-ILS/src/sql/Pg/upgrade/0641.schema.org_unit_setting_json_check.sql
@@ -1,10 +1,10 @@
--- Evergreen DB patch XXXX.schema.org_unit_setting_json_check.sql
+-- Evergreen DB patch 0641.schema.org_unit_setting_json_check.sql
 --
 --
 BEGIN;
 
 -- check whether patch can be applied
-SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+SELECT evergreen.upgrade_deps_block_check('0641', :eg_version);
 
 ALTER TABLE actor.org_unit_setting ADD CONSTRAINT aous_must_be_json CHECK ( evergreen.is_json(value) );
 

commit e4b1f26c84f090b1ccc2c56681ac3bff40e1b7d8
Author: Jason Etheridge <jason at esilibrary.com>
Date:   Mon Sep 12 11:29:51 2011 -0400

    LP#847973 ensure JSON values for org settings
    
    I don't believe you can violate this constraint via the Library Settings UI,
    but this will catch speedy-admins mucking directly in the database.
    
    Signed-off-by: Jason Etheridge <jason at esilibrary.com>
    Signed-off-by: Thomas Berezansky <tsbere at mvlc.org>

diff --git a/Open-ILS/src/sql/Pg/005.schema.actors.sql b/Open-ILS/src/sql/Pg/005.schema.actors.sql
index 4306245..3f8fb92 100644
--- a/Open-ILS/src/sql/Pg/005.schema.actors.sql
+++ b/Open-ILS/src/sql/Pg/005.schema.actors.sql
@@ -457,7 +457,8 @@ CREATE TABLE actor.org_unit_setting (
 	org_unit	INT		NOT NULL REFERENCES actor.org_unit ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
 	name		TEXT	NOT NULL REFERENCES config.org_unit_setting_type DEFERRABLE INITIALLY DEFERRED,
 	value		TEXT		NOT NULL,
-	CONSTRAINT ou_once_per_key UNIQUE (org_unit,name)
+	CONSTRAINT ou_once_per_key UNIQUE (org_unit,name),
+	CONSTRAINT aous_must_be_json CHECK ( evergreen.is_json(value) )
 );
 COMMENT ON TABLE actor.org_unit_setting IS $$
 Org Unit settings
diff --git a/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.org_unit_setting_json_check.sql b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.org_unit_setting_json_check.sql
new file mode 100644
index 0000000..0e96020
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/XXXX.schema.org_unit_setting_json_check.sql
@@ -0,0 +1,11 @@
+-- Evergreen DB patch XXXX.schema.org_unit_setting_json_check.sql
+--
+--
+BEGIN;
+
+-- check whether patch can be applied
+SELECT evergreen.upgrade_deps_block_check('XXXX', :eg_version);
+
+ALTER TABLE actor.org_unit_setting ADD CONSTRAINT aous_must_be_json CHECK ( evergreen.is_json(value) );
+
+COMMIT;

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

Summary of changes:
 Open-ILS/src/sql/Pg/002.schema.config.sql          |    2 +-
 Open-ILS/src/sql/Pg/005.schema.actors.sql          |    3 ++-
 .../0641.schema.org_unit_setting_json_check.sql    |   11 +++++++++++
 3 files changed, 14 insertions(+), 2 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0641.schema.org_unit_setting_json_check.sql


hooks/post-receive
-- 
Evergreen ILS