From 4adbb89c4cd0bcfe60b067b2e0e3ba2db4c98dd0 Mon Sep 17 00:00:00 2001 From: Nicole Engard Date: Tue, 29 Jun 2010 06:22:29 -0400 Subject: [PATCH] bug 2434 followup patch to remove EVENT from message_transports Signed-off-by: Galen Charlton --- .../de-DE/optional/sample_notices_message_transports.sql | 2 -- .../en/optional/sample_notices_message_transports.sql | 2 -- .../fr-FR/2-Optionel/sample_notices_message_transports.sql | 2 -- .../pl-PL/optional/sample_notices_message_transports.sql | 2 -- .../ru-RU/optional/sample_notices_message_transports.sql | 2 -- .../uk-UA/optional/sample_notices_message_transports.sql | 2 -- installer/data/mysql/updatedatabase.pl | 7 +++++++ 7 files changed, 7 insertions(+), 12 deletions(-) diff --git a/installer/data/mysql/de-DE/optional/sample_notices_message_transports.sql b/installer/data/mysql/de-DE/optional/sample_notices_message_transports.sql index 65d08d9f3c..ae68378d13 100644 --- a/installer/data/mysql/de-DE/optional/sample_notices_message_transports.sql +++ b/installer/data/mysql/de-DE/optional/sample_notices_message_transports.sql @@ -5,13 +5,11 @@ values (1, 'email', 1, 'circulation', 'DUEDGST'), (2, 'email', 0, 'circulation', 'PREDUE'), (2, 'email', 1, 'circulation', 'PREDUEDGST'), -(3, 'email', 0, 'circulation', 'EVENT'), (4, 'email', 0, 'reserves', 'HOLD'), (1, 'sms', 0, 'circulation', 'DUE'), (1, 'sms', 1, 'circulation', 'DUEDGST'), (2, 'sms', 0, 'circulation', 'PREDUE'), (2, 'sms', 1, 'circulation', 'PREDUEDGST'), -(3, 'sms', 0, 'circulation', 'EVENT'), (4, 'sms', 0, 'reserves', 'HOLD'), (5, 'email', 0, 'circulation', 'CHECKIN'), (5, 'sms', 0, 'circulation', 'CHECKIN'), diff --git a/installer/data/mysql/en/optional/sample_notices_message_transports.sql b/installer/data/mysql/en/optional/sample_notices_message_transports.sql index 65d08d9f3c..ae68378d13 100644 --- a/installer/data/mysql/en/optional/sample_notices_message_transports.sql +++ b/installer/data/mysql/en/optional/sample_notices_message_transports.sql @@ -5,13 +5,11 @@ values (1, 'email', 1, 'circulation', 'DUEDGST'), (2, 'email', 0, 'circulation', 'PREDUE'), (2, 'email', 1, 'circulation', 'PREDUEDGST'), -(3, 'email', 0, 'circulation', 'EVENT'), (4, 'email', 0, 'reserves', 'HOLD'), (1, 'sms', 0, 'circulation', 'DUE'), (1, 'sms', 1, 'circulation', 'DUEDGST'), (2, 'sms', 0, 'circulation', 'PREDUE'), (2, 'sms', 1, 'circulation', 'PREDUEDGST'), -(3, 'sms', 0, 'circulation', 'EVENT'), (4, 'sms', 0, 'reserves', 'HOLD'), (5, 'email', 0, 'circulation', 'CHECKIN'), (5, 'sms', 0, 'circulation', 'CHECKIN'), diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_transports.sql b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_transports.sql index 65d08d9f3c..ae68378d13 100644 --- a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_transports.sql +++ b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_transports.sql @@ -5,13 +5,11 @@ values (1, 'email', 1, 'circulation', 'DUEDGST'), (2, 'email', 0, 'circulation', 'PREDUE'), (2, 'email', 1, 'circulation', 'PREDUEDGST'), -(3, 'email', 0, 'circulation', 'EVENT'), (4, 'email', 0, 'reserves', 'HOLD'), (1, 'sms', 0, 'circulation', 'DUE'), (1, 'sms', 1, 'circulation', 'DUEDGST'), (2, 'sms', 0, 'circulation', 'PREDUE'), (2, 'sms', 1, 'circulation', 'PREDUEDGST'), -(3, 'sms', 0, 'circulation', 'EVENT'), (4, 'sms', 0, 'reserves', 'HOLD'), (5, 'email', 0, 'circulation', 'CHECKIN'), (5, 'sms', 0, 'circulation', 'CHECKIN'), diff --git a/installer/data/mysql/pl-PL/optional/sample_notices_message_transports.sql b/installer/data/mysql/pl-PL/optional/sample_notices_message_transports.sql index 65d08d9f3c..ae68378d13 100644 --- a/installer/data/mysql/pl-PL/optional/sample_notices_message_transports.sql +++ b/installer/data/mysql/pl-PL/optional/sample_notices_message_transports.sql @@ -5,13 +5,11 @@ values (1, 'email', 1, 'circulation', 'DUEDGST'), (2, 'email', 0, 'circulation', 'PREDUE'), (2, 'email', 1, 'circulation', 'PREDUEDGST'), -(3, 'email', 0, 'circulation', 'EVENT'), (4, 'email', 0, 'reserves', 'HOLD'), (1, 'sms', 0, 'circulation', 'DUE'), (1, 'sms', 1, 'circulation', 'DUEDGST'), (2, 'sms', 0, 'circulation', 'PREDUE'), (2, 'sms', 1, 'circulation', 'PREDUEDGST'), -(3, 'sms', 0, 'circulation', 'EVENT'), (4, 'sms', 0, 'reserves', 'HOLD'), (5, 'email', 0, 'circulation', 'CHECKIN'), (5, 'sms', 0, 'circulation', 'CHECKIN'), diff --git a/installer/data/mysql/ru-RU/optional/sample_notices_message_transports.sql b/installer/data/mysql/ru-RU/optional/sample_notices_message_transports.sql index 8ed8c1e4b2..ade4d03830 100644 --- a/installer/data/mysql/ru-RU/optional/sample_notices_message_transports.sql +++ b/installer/data/mysql/ru-RU/optional/sample_notices_message_transports.sql @@ -7,12 +7,10 @@ values (1, 'email', 1, 'circulation', 'DUEDGST'), (2, 'email', 0, 'circulation', 'PREDUE'), (2, 'email', 1, 'circulation', 'PREDUEDGST'), -(3, 'email', 0, 'circulation', 'EVENT'), (1, 'sms', 0, 'circulation', 'DUE'), (1, 'sms', 1, 'circulation', 'DUEDGST'), (2, 'sms', 0, 'circulation', 'PREDUE'), (2, 'sms', 1, 'circulation', 'PREDUEDGST'), -(3, 'sms', 0, 'circulation', 'EVENT'), (4, 'sms', 0, 'reserves', 'HOLD'), (5, 'email', 0, 'circulation', 'CHECKIN'), (5, 'sms', 0, 'circulation', 'CHECKIN'), diff --git a/installer/data/mysql/uk-UA/optional/sample_notices_message_transports.sql b/installer/data/mysql/uk-UA/optional/sample_notices_message_transports.sql index 8ed8c1e4b2..ade4d03830 100644 --- a/installer/data/mysql/uk-UA/optional/sample_notices_message_transports.sql +++ b/installer/data/mysql/uk-UA/optional/sample_notices_message_transports.sql @@ -7,12 +7,10 @@ values (1, 'email', 1, 'circulation', 'DUEDGST'), (2, 'email', 0, 'circulation', 'PREDUE'), (2, 'email', 1, 'circulation', 'PREDUEDGST'), -(3, 'email', 0, 'circulation', 'EVENT'), (1, 'sms', 0, 'circulation', 'DUE'), (1, 'sms', 1, 'circulation', 'DUEDGST'), (2, 'sms', 0, 'circulation', 'PREDUE'), (2, 'sms', 1, 'circulation', 'PREDUEDGST'), -(3, 'sms', 0, 'circulation', 'EVENT'), (4, 'sms', 0, 'reserves', 'HOLD'), (5, 'email', 0, 'circulation', 'CHECKIN'), (5, 'sms', 0, 'circulation', 'CHECKIN'), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 0569d6ded1..329722793a 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -3670,6 +3670,13 @@ if (C4::Context->preference('Version') < TransformToNum($DBversion)){ SetVersion ($DBversion); } +$DBversion = 'XXX'; +if (C4::Context->preference('Version') < TransformToNum($DBversion)){ + $dbh->do(qq{DELETE FROM message_transports WHERE message_attribute_id=3;}); + print "Upgrade to $DBversion done Remove upcoming events messaging option part 2 (bug 2434)"; + SetVersion ($DBversion); +} + =item DropAllForeignKeys($table) -- 2.20.1