[Koha-patches] [PATCH] bug 2434 remove upcoming messaging option from db

[Nicole Engard]

This message was never implemented and so it shouldn't
be in the database as it causes confusion for patrons
and librarians a like.
---
 .../optional/sample_notices_message_attributes.sql |    1 -
 .../sample_notices_message_attributes.sql          |    1 -
 installer/data/mysql/updatedatabase.pl             |    8 ++++++++
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/installer/data/mysql/en/optional/sample_notices_message_attributes.sql b/installer/data/mysql/en/optional/sample_notices_message_attributes.sql
index 5d1ecb6..1834063 100644
--- a/installer/data/mysql/en/optional/sample_notices_message_attributes.sql
+++ b/installer/data/mysql/en/optional/sample_notices_message_attributes.sql
@@ -3,7 +3,6 @@ insert into `message_attributes`
 values
 (1, 'Item DUE', 0),
 (2, 'Advance Notice', 1),
-(3, 'Upcoming Events', 1),
 (4, 'Hold Filled', 0),
 (5, 'Item Check-in', 0),
 (6, 'Item Checkout', 0);
diff --git a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql
index 5d1ecb6..1834063 100644
--- a/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql
+++ b/installer/data/mysql/fr-FR/2-Optionel/sample_notices_message_attributes.sql
@@ -3,7 +3,6 @@ insert into `message_attributes`
 values
 (1, 'Item DUE', 0),
 (2, 'Advance Notice', 1),
-(3, 'Upcoming Events', 1),
 (4, 'Hold Filled', 0),
 (5, 'Item Check-in', 0),
 (6, 'Item Checkout', 0);
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 1d90656..1b66e15 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -3624,6 +3624,14 @@ INSERT INTO permissions (module_bit, code, description) VALUES
     SetVersion ($DBversion);
 }
 
+$DBversion = 'XXX';
+if (C4::Context->preference('Version') < TransformToNum($DBversion)){
+    $dbh->do(qq{
+Delete from message_attributes where message_attribute_id=3;});
+    print "Upgrade to $DBversion done Remove upcoming events messaging option (bug 2434)";
+    SetVersion ($DBversion);
+}
+
 
 =item DropAllForeignKeys($table)
 
-- 
1.5.6.5