[open-ils-commits] r17218 - branches/rel_1_6/Open-ILS/src/sql/Pg (dbs)
svn at svn.open-ils.org
svn at svn.open-ils.org
Fri Aug 13 15:08:09 EDT 2010
Author: dbs
Date: 2010-08-13 15:08:04 -0400 (Fri, 13 Aug 2010)
New Revision: 17218
Modified:
branches/rel_1_6/Open-ILS/src/sql/Pg/1.6.1.1-1.6.1.2-upgrade-db.sql
branches/rel_1_6/Open-ILS/src/sql/Pg/950.data.seed-values.sql
Log:
Grant booking/reservation permissions in a way that is valid SQL
Modified: branches/rel_1_6/Open-ILS/src/sql/Pg/1.6.1.1-1.6.1.2-upgrade-db.sql
===================================================================
--- branches/rel_1_6/Open-ILS/src/sql/Pg/1.6.1.1-1.6.1.2-upgrade-db.sql 2010-08-13 19:03:00 UTC (rev 17217)
+++ branches/rel_1_6/Open-ILS/src/sql/Pg/1.6.1.1-1.6.1.2-upgrade-db.sql 2010-08-13 19:08:04 UTC (rev 17218)
@@ -602,19 +602,19 @@
CREATE INDEX atev_target_def_idx ON action_trigger.event (target,event_def);
-- Give circulation staff the ability to handle day-to-day booking/reservation tasks
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (5, 'ADMIN_BOOKING_RESERVATION', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (5, 'RETRIEVE_RESERVATION_PULL_LIST', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (5, 'CAPTURE_RESERVATION', 2, false);
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 5, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESERVATION';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 5, id, 2, false FROM permission.perm_list WHERE code = 'RETRIEVE_RESERVATION_PULL_LIST';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 5, id, 2, false FROM permission.perm_list WHERE code = 'CAPTURE_RESERVATION';
-- Give local administrators the ability to handle all booking/reservation tasks
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'ADMIN_BOOKING_RESOURCE', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'ADMIN_BOOKING_RESOURCE_TYPE', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'ADMIN_BOOKING_RESOURCE_ATTR', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'ADMIN_BOOKING_RESOURCE_ATTR_MAP', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'ADMIN_BOOKING_RESOURCE_ATTR_VALUE', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'ADMIN_BOOKING_RESERVATION', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'ADMIN_BOOKING_RESERVATION_ATTR_VALUE_MAP', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'HOLD_ITEM_CHECKED_OUT.override', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'RETRIEVE_RESERVATION_PULL_LIST', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'CAPTURE_RESERVATION', 2, false);
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESOURCE';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESOURCE_TYPE';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESOURCE_ATTR';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESOURCE_ATTR_MAP';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESOURCE_ATTR_VALUE';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESERVATION';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESERVATION_ATTR_VALUE_MAP';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'HOLD_ITEM_CHECKED_OUT.override';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'RETRIEVE_RESERVATION_PULL_LIST';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'CAPTURE_RESERVATION';
Modified: branches/rel_1_6/Open-ILS/src/sql/Pg/950.data.seed-values.sql
===================================================================
--- branches/rel_1_6/Open-ILS/src/sql/Pg/950.data.seed-values.sql 2010-08-13 19:03:00 UTC (rev 17217)
+++ branches/rel_1_6/Open-ILS/src/sql/Pg/950.data.seed-values.sql 2010-08-13 19:08:04 UTC (rev 17218)
@@ -1581,21 +1581,21 @@
INSERT INTO permission.perm_list (code, description) VALUES ('MERGE_USERS', 'Allows user records to be merged');
-- Give circulation staff the ability to handle day-to-day booking/reservation tasks
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (5, 'ADMIN_BOOKING_RESERVATION', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (5, 'RETRIEVE_RESERVATION_PULL_LIST', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (5, 'CAPTURE_RESERVATION', 2, false);
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 5, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESERVATION';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 5, id, 2, false FROM permission.perm_list WHERE code = 'RETRIEVE_RESERVATION_PULL_LIST';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 5, id, 2, false FROM permission.perm_list WHERE code = 'CAPTURE_RESERVATION';
-- Give local administrators the ability to handle all booking/reservation tasks
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'ADMIN_BOOKING_RESOURCE', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'ADMIN_BOOKING_RESOURCE_TYPE', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'ADMIN_BOOKING_RESOURCE_ATTR', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'ADMIN_BOOKING_RESOURCE_ATTR_MAP', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'ADMIN_BOOKING_RESOURCE_ATTR_VALUE', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'ADMIN_BOOKING_RESERVATION', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'ADMIN_BOOKING_RESERVATION_ATTR_VALUE_MAP', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'HOLD_ITEM_CHECKED_OUT.override', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'RETRIEVE_RESERVATION_PULL_LIST', 2, false);
-INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) VALUES (10, 'CAPTURE_RESERVATION', 2, false);
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESOURCE';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESOURCE_TYPE';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESOURCE_ATTR';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESOURCE_ATTR_MAP';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESOURCE_ATTR_VALUE';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESERVATION';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'ADMIN_BOOKING_RESERVATION_ATTR_VALUE_MAP';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'HOLD_ITEM_CHECKED_OUT.override';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'RETRIEVE_RESERVATION_PULL_LIST';
+INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT 10, id, 2, false FROM permission.perm_list WHERE code = 'CAPTURE_RESERVATION';
-- Trigger event definition permissions
INSERT INTO permission.perm_list (code, description) VALUES ('ADMIN_TRIGGER_EVENT_DEF', 'Allow a user to administer trigger event definitions');
More information about the open-ils-commits
mailing list