[open-ils-commits] r18146 - in trunk/Open-ILS: examples src/perlmods/OpenILS/Application/Storage/CDBI src/sql/Pg src/sql/Pg/upgrade (scottmk)

[svn at svn.open-ils.org]

Author: scottmk
Date: 2010-10-04 09:43:13 -0400 (Mon, 04 Oct 2010)
New Revision: 18146

Added:
   trunk/Open-ILS/src/sql/Pg/upgrade/0425.schema.perm-grp-tree-hold-priority.sql
Modified:
   trunk/Open-ILS/examples/fm_IDL.xml
   trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/permission.pm
   trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
   trunk/Open-ILS/src/sql/Pg/006.schema.permissions.sql
Log:
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


Modified: trunk/Open-ILS/examples/fm_IDL.xml
===================================================================
--- trunk/Open-ILS/examples/fm_IDL.xml	2010-10-04 01:47:40 UTC (rev 18145)
+++ trunk/Open-ILS/examples/fm_IDL.xml	2010-10-04 13:43:13 UTC (rev 18146)
@@ -4515,6 +4515,7 @@
 			<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"/>

Modified: trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/permission.pm
===================================================================
--- trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/permission.pm	2010-10-04 01:47:40 UTC (rev 18145)
+++ trunk/Open-ILS/src/perlmods/OpenILS/Application/Storage/CDBI/permission.pm	2010-10-04 13:43:13 UTC (rev 18146)
@@ -16,7 +16,7 @@
 __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/;

Modified: trunk/Open-ILS/src/sql/Pg/002.schema.config.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-10-04 01:47:40 UTC (rev 18145)
+++ trunk/Open-ILS/src/sql/Pg/002.schema.config.sql	2010-10-04 13:43:13 UTC (rev 18146)
@@ -70,7 +70,7 @@
     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,

Modified: trunk/Open-ILS/src/sql/Pg/006.schema.permissions.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/006.schema.permissions.sql	2010-10-04 01:47:40 UTC (rev 18145)
+++ trunk/Open-ILS/src/sql/Pg/006.schema.permissions.sql	2010-10-04 13:43:13 UTC (rev 18146)
@@ -38,7 +38,8 @@
 	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);
 

Added: trunk/Open-ILS/src/sql/Pg/upgrade/0425.schema.perm-grp-tree-hold-priority.sql
===================================================================
--- trunk/Open-ILS/src/sql/Pg/upgrade/0425.schema.perm-grp-tree-hold-priority.sql	                        (rev 0)
+++ trunk/Open-ILS/src/sql/Pg/upgrade/0425.schema.perm-grp-tree-hold-priority.sql	2010-10-04 13:43:13 UTC (rev 18146)
@@ -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;