Add hold_priority column to permission.grp_tree table.

For trunk and 1.6, and eventually for 1.6.2 and 2.1, but *not*
for 1.6.1 or 2.0.

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/src/perlmods/OpenILS/Application/Storage/CDBI/permission.pm
M    Open-ILS/examples/fm_IDL.xml

git-svn-id: svn://svn.open-ils.org/ILS/branches/rel_1_6@18147 dcc99617-32d9-48b4-a31d-7c20da2025e4

diff --git a/Open-ILS/examples/fm_IDL.xml b/Open-ILS/examples/fm_IDL.xml
index 46cd589..7f7f1ec 100644 (file)
--- a/Open-ILS/examples/fm_IDL.xml
+++ b/Open-ILS/examples/fm_IDL.xml
@@ -3515,6 +3515,7 @@ Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
                        <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 7247740..f56e1e5 100644 (file)
--- 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/006.schema.permissions.sql b/Open-ILS/src/sql/Pg/006.schema.permissions.sql
index 7e5515f..29c9ee7 100644 (file)
--- a/Open-ILS/src/sql/Pg/006.schema.permissions.sql
+++ b/Open-ILS/src/sql/Pg/006.schema.permissions.sql
@@ -35,7 +35,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 (file)
index 0000000..e556b0a
--- /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;