From f3b94c2200fcb0d0ea70e9ffd7f6f277e5cc51dc Mon Sep 17 00:00:00 2001
From: scottmk <scottmk@dcc99617-32d9-48b4-a31d-7c20da2025e4>
Date: Mon, 4 Oct 2010 13:43:13 +0000
Subject: [PATCH] Add hold_priority column to permission.grp_tree table.

M    Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/permission.pm
M    Open-ILS/src/sql/Pg/002.schema.config.sql
A    Open-ILS/src/sql/Pg/upgrade/0425.schema.perm-grp-tree-hold-priority.sql
M    Open-ILS/src/sql/Pg/006.schema.permissions.sql
M    Open-ILS/examples/fm_IDL.xml


git-svn-id: svn://svn.open-ils.org/ILS/trunk@18146 dcc99617-32d9-48b4-a31d-7c20da2025e4
---
 Open-ILS/examples/fm_IDL.xml                                      | 1 +
 .../src/perlmods/OpenILS/Application/Storage/CDBI/permission.pm   | 2 +-
 Open-ILS/src/sql/Pg/002.schema.config.sql                         | 2 +-
 Open-ILS/src/sql/Pg/006.schema.permissions.sql                    | 3 ++-
 .../sql/Pg/upgrade/0425.schema.perm-grp-tree-hold-priority.sql    | 8 ++++++++
 5 files changed, 13 insertions(+), 3 deletions(-)
 create mode 100644 Open-ILS/src/sql/Pg/upgrade/0425.schema.perm-grp-tree-hold-priority.sql

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 7074c53177..8fd048ce0a 100644
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -4515,6 +4515,7 @@ SELECT  usr,
 			<field reporter:label="User Expiration Interval" name="perm_interval" reporter:datatype="interval"/>
 			<field reporter:label="Required Permission" name="application_perm" reporter:datatype="text"/>
 			<field reporter:label="Is User Group" name="usergroup" reporter:datatype="bool"/>
+			<field reporter:label="Hold Priority" name="hold_priority" reporter:datatype="int"/>
 		</fields>
 		<links>
 			<link field="parent" reltype="has_a" key="id" map="" class="pgt"/>
diff --git a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/permission.pm b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/permission.pm
index 724774041b..f56e1e585e 100644
--- a/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/permission.pm
+++ b/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/permission.pm
@@ -16,7 +16,7 @@ use base qw/permission/;
 __PACKAGE__->table('permission_grp_tree');
 __PACKAGE__->columns(Primary => qw/id/);
 __PACKAGE__->columns(Essential => qw/name parent description perm_interval
-				     application_perm usergroup/);
+				     application_perm usergroup hold_priority/);
 #-------------------------------------------------------------------------------
 package permission::usr_grp_map;
 use base qw/permission/;
diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql
index c864e8e774..d46c498cf6 100644
--- a/Open-ILS/src/sql/Pg/002.schema.config.sql
+++ b/Open-ILS/src/sql/Pg/002.schema.config.sql
@@ -70,7 +70,7 @@ CREATE TABLE config.upgrade_log (
     install_date    TIMESTAMP WITH TIME ZONE NOT NULL DEFAULT NOW()
 );
 
-INSERT INTO config.upgrade_log (version) VALUES ('0424'); -- dbs
+INSERT INTO config.upgrade_log (version) VALUES ('0425'); -- Scott McKellar
 
 CREATE TABLE config.bib_source (
 	id		SERIAL	PRIMARY KEY,
diff --git a/Open-ILS/src/sql/Pg/006.schema.permissions.sql b/Open-ILS/src/sql/Pg/006.schema.permissions.sql
index c734d94c64..4be5c7d5e6 100644
--- a/Open-ILS/src/sql/Pg/006.schema.permissions.sql
+++ b/Open-ILS/src/sql/Pg/006.schema.permissions.sql
@@ -38,7 +38,8 @@ CREATE TABLE permission.grp_tree (
 	usergroup		BOOL	NOT NULL DEFAULT TRUE,
 	perm_interval		INTERVAL DEFAULT '3 years'::interval NOT NULL,
 	description		TEXT,
-	application_perm	TEXT
+	application_perm	TEXT,
+	hold_priority       INT   NOT NULL DEFAULT 0
 );
 CREATE INDEX grp_tree_parent_idx ON permission.grp_tree (parent);
 
diff --git a/Open-ILS/src/sql/Pg/upgrade/0425.schema.perm-grp-tree-hold-priority.sql b/Open-ILS/src/sql/Pg/upgrade/0425.schema.perm-grp-tree-hold-priority.sql
new file mode 100644
index 0000000000..e556b0a336
--- /dev/null
+++ b/Open-ILS/src/sql/Pg/upgrade/0425.schema.perm-grp-tree-hold-priority.sql
@@ -0,0 +1,8 @@
+BEGIN;
+
+INSERT INTO config.upgrade_log (version) VALUES ('0425'); -- Scott McKellar
+
+ALTER TABLE permission.grp_tree
+	ADD COLUMN hold_priority INT NOT NULL DEFAULT 0;
+
+COMMIT;
-- 
2.11.0