From 096ce41b7877fc9440930c5199a83d4f4dc55a90 Mon Sep 17 00:00:00 2001 From: Jason Etheridge Date: Tue, 10 Jan 2012 15:49:23 -0500 Subject: [PATCH] fix breakage from recent merges Also, a good argument for keeping all perm additions in the same INSERT in the 950 file, since git would have reported a merge conflict against master had I done that instead of simply appending the upgrade script to the file. Signed-off-by: Jason Etheridge --- Open-ILS/src/sql/Pg/002.schema.config.sql | 2 +- Open-ILS/src/sql/Pg/950.data.seed-values.sql | 18 ++++-------------- .../src/sql/Pg/upgrade/0666.schema.sms_carriers.sql | 6 +++--- 3 files changed, 8 insertions(+), 18 deletions(-) diff --git a/Open-ILS/src/sql/Pg/002.schema.config.sql b/Open-ILS/src/sql/Pg/002.schema.config.sql index fbe6210b33..1c71641ca0 100644 --- a/Open-ILS/src/sql/Pg/002.schema.config.sql +++ b/Open-ILS/src/sql/Pg/002.schema.config.sql @@ -136,7 +136,7 @@ INSERT INTO config.standing_penalty (id,name,label,block_list,staff_alert) INSERT INTO config.standing_penalty (id,name,label,staff_alert) VALUES (20,'ALERT_NOTE','Alerting Note, no blocks',TRUE); INSERT INTO config.standing_penalty (id,name,label) VALUES (21,'SILENT_NOTE','Note, no blocks'); -INSERT INTO config.standing_penalty (id,name,label,block_list,staff_alert) VALUES (22,'STAFF_C','Alerting block on Circ','CIRC'); +INSERT INTO config.standing_penalty (id,name,label,block_list,staff_alert) VALUES (22,'STAFF_C','Alerting block on Circ','CIRC', TRUE); INSERT INTO config.standing_penalty (id,name,label,block_list,staff_alert) VALUES (23,'STAFF_CH','Alerting block on Circ and Hold','CIRC|HOLD', TRUE); INSERT INTO config.standing_penalty (id,name,label,block_list,staff_alert) VALUES (24,'STAFF_CR','Alerting block on Circ and Renew','CIRC|RENEW', TRUE); INSERT INTO config.standing_penalty (id,name,label,block_list,staff_alert) VALUES (25,'STAFF_CHR','Alerting block on Circ, Hold and Renew','CIRC|HOLD|RENEW', TRUE); diff --git a/Open-ILS/src/sql/Pg/950.data.seed-values.sql b/Open-ILS/src/sql/Pg/950.data.seed-values.sql index 4865bddd12..4e72cdaf98 100644 --- a/Open-ILS/src/sql/Pg/950.data.seed-values.sql +++ b/Open-ILS/src/sql/Pg/950.data.seed-values.sql @@ -1452,7 +1452,10 @@ INSERT INTO permission.perm_list ( id, code, description ) VALUES ( 517, 'COPY_HOLDS_FORCE', oils_i18n_gettext( 517, 'Allow a user to place a force hold on a specific copy', 'ppl', 'description' )), ( 518, 'COPY_HOLDS_RECALL', oils_i18n_gettext( 518, - 'Allow a user to place a cataloging recall on a specific copy', 'ppl', 'description' )); + 'Allow a user to place a cataloging recall on a specific copy', 'ppl', 'description' )), + ( 519, 'ADMIN_SMS_CARRIER', oils_i18n_gettext( 519, + 'Allows a user to add/create/delete SMS Carrier entries.', 'ppl', 'description' )); + SELECT SETVAL('permission.perm_list_id_seq'::TEXT, 1000); @@ -11646,19 +11649,6 @@ INSERT INTO config.sms_carrier VALUES ) ; -INSERT INTO permission.perm_list ( id, code, description ) VALUES - ( - 517, - 'ADMIN_SMS_CARRIER', - oils_i18n_gettext( - 517, - 'Allows a user to add/create/delete SMS Carrier entries.', - 'ppl', - 'description' - ) - ) -; - INSERT INTO permission.grp_perm_map (grp, perm, depth, grantable) SELECT pgt.id, perm.id, aout.depth, TRUE diff --git a/Open-ILS/src/sql/Pg/upgrade/0666.schema.sms_carriers.sql b/Open-ILS/src/sql/Pg/upgrade/0666.schema.sms_carriers.sql index f1497b76c8..d090f53d1d 100644 --- a/Open-ILS/src/sql/Pg/upgrade/0666.schema.sms_carriers.sql +++ b/Open-ILS/src/sql/Pg/upgrade/0666.schema.sms_carriers.sql @@ -1251,10 +1251,10 @@ INSERT INTO config.sms_carrier VALUES INSERT INTO permission.perm_list ( id, code, description ) VALUES ( - 517, + 519, 'ADMIN_SMS_CARRIER', oils_i18n_gettext( - 517, + 519, 'Allows a user to add/create/delete SMS Carrier entries.', 'ppl', 'description' @@ -1406,6 +1406,6 @@ INSERT INTO action_trigger.environment ( ); --- DELETE FROM actor.usr_setting WHERE name = 'opac.default_phone' OR name in ( SELECT name FROM config.usr_setting_type WHERE grp = 'sms' ); DELETE FROM config.usr_setting_type WHERE name = 'opac.default_phone' OR grp = 'sms'; DELETE FROM actor.org_unit_setting WHERE name in ( SELECT name FROM config.org_unit_setting_type WHERE grp = 'sms' ); DELETE FROM config.org_unit_setting_type_log WHERE field_name in ( SELECT name FROM config.org_unit_setting_type WHERE grp = 'sms' ); DELETE FROM config.org_unit_setting_type WHERE grp = 'sms'; DELETE FROM config.settings_group WHERE name = 'sms'; DELETE FROM permission.grp_perm_map WHERE perm = 517; DELETE FROM permission.perm_list WHERE id = 517; ALTER TABLE action.hold_request DROP CONSTRAINT sms_check; ALTER TABLE action.hold_request DROP COLUMN sms_notify; ALTER TABLE action.hold_request DROP COLUMN sms_carrier; DROP TABLE config.sms_carrier; DELETE FROM action_trigger.event WHERE event_def = ( SELECT id FROM action_trigger.event_definition WHERE name = 'Hold Ready for Pickup SMS Notification' ); DELETE FROM action_trigger.environment WHERE event_def = ( SELECT id FROM action_trigger.event_definition WHERE name = 'Hold Ready for Pickup SMS Notification' ); DELETE FROM action_trigger.event_definition WHERE name = 'Hold Ready for Pickup SMS Notification'; DELETE FROM action_trigger.event WHERE event_def IN ( SELECT id FROM action_trigger.event_definition WHERE hook = 'acn.format.sms_text' ); DELETE FROM action_trigger.environment WHERE event_def IN ( SELECT id FROM action_trigger.event_definition WHERE hook = 'acn.format.sms_text' ); DELETE FROM action_trigger.event_definition WHERE hook = 'acn.format.sms_text'; DELETE FROM action_trigger.hook WHERE key = 'acn.format.sms_text'; DELETE FROM action_trigger.reactor WHERE module = 'SendSMS'; DELETE FROM config.upgrade_log WHERE version = 'XXXX'; +-- DELETE FROM actor.usr_setting WHERE name = 'opac.default_phone' OR name in ( SELECT name FROM config.usr_setting_type WHERE grp = 'sms' ); DELETE FROM config.usr_setting_type WHERE name = 'opac.default_phone' OR grp = 'sms'; DELETE FROM actor.org_unit_setting WHERE name in ( SELECT name FROM config.org_unit_setting_type WHERE grp = 'sms' ); DELETE FROM config.org_unit_setting_type_log WHERE field_name in ( SELECT name FROM config.org_unit_setting_type WHERE grp = 'sms' ); DELETE FROM config.org_unit_setting_type WHERE grp = 'sms'; DELETE FROM config.settings_group WHERE name = 'sms'; DELETE FROM permission.grp_perm_map WHERE perm = 519; DELETE FROM permission.perm_list WHERE id = 519; ALTER TABLE action.hold_request DROP CONSTRAINT sms_check; ALTER TABLE action.hold_request DROP COLUMN sms_notify; ALTER TABLE action.hold_request DROP COLUMN sms_carrier; DROP TABLE config.sms_carrier; DELETE FROM action_trigger.event WHERE event_def = ( SELECT id FROM action_trigger.event_definition WHERE name = 'Hold Ready for Pickup SMS Notification' ); DELETE FROM action_trigger.environment WHERE event_def = ( SELECT id FROM action_trigger.event_definition WHERE name = 'Hold Ready for Pickup SMS Notification' ); DELETE FROM action_trigger.event_definition WHERE name = 'Hold Ready for Pickup SMS Notification'; DELETE FROM action_trigger.event WHERE event_def IN ( SELECT id FROM action_trigger.event_definition WHERE hook = 'acn.format.sms_text' ); DELETE FROM action_trigger.environment WHERE event_def IN ( SELECT id FROM action_trigger.event_definition WHERE hook = 'acn.format.sms_text' ); DELETE FROM action_trigger.event_definition WHERE hook = 'acn.format.sms_text'; DELETE FROM action_trigger.hook WHERE key = 'acn.format.sms_text'; DELETE FROM action_trigger.reactor WHERE module = 'SendSMS'; DELETE FROM config.upgrade_log WHERE version = 'XXXX'; COMMIT; -- 2.11.0