@@ -, +, @@ used and can be removed --- .../de-DE/mandatory/message_transport_types.sql | 1 - .../mysql/en/mandatory/message_transport_types.sql | 1 - .../es-ES/mandatory/message_transport_types.sql | 1 - .../1-Obligatoire/message_transport_types.sql | 1 - .../it-IT/necessari/message_transport_types.sql | 1 - .../1-Obligatorisk/message_transport_types.sql | 1 - .../ru-RU/mandatory/message_transport_types.sql | 1 - .../uk-UA/mandatory/message_transport_types.sql | 1 - installer/data/mysql/updatedatabase.pl | 30 ++++++++++++++++++++ 9 files changed, 30 insertions(+), 8 deletions(-) --- a/installer/data/mysql/de-DE/mandatory/message_transport_types.sql +++ a/installer/data/mysql/de-DE/mandatory/message_transport_types.sql @@ -4,5 +4,4 @@ values ('email'), ('print'), ('sms'), -('feed'), ('phone'); --- a/installer/data/mysql/en/mandatory/message_transport_types.sql +++ a/installer/data/mysql/en/mandatory/message_transport_types.sql @@ -4,5 +4,4 @@ values ('email'), ('print'), ('sms'), -('feed'), ('phone'); --- a/installer/data/mysql/es-ES/mandatory/message_transport_types.sql +++ a/installer/data/mysql/es-ES/mandatory/message_transport_types.sql @@ -4,5 +4,4 @@ values ('email'), ('print'), ('sms'), -('feed'), ('phone'); --- a/installer/data/mysql/fr-FR/1-Obligatoire/message_transport_types.sql +++ a/installer/data/mysql/fr-FR/1-Obligatoire/message_transport_types.sql @@ -4,5 +4,4 @@ values ('print'), ('email'), ('sms'), -('feed'), ('phone'); --- a/installer/data/mysql/it-IT/necessari/message_transport_types.sql +++ a/installer/data/mysql/it-IT/necessari/message_transport_types.sql @@ -6,7 +6,6 @@ values ('email'), ('print'), ('sms'), -('feed'), ('phone'); SET FOREIGN_KEY_CHECKS=1; --- a/installer/data/mysql/nb-NO/1-Obligatorisk/message_transport_types.sql +++ a/installer/data/mysql/nb-NO/1-Obligatorisk/message_transport_types.sql @@ -25,5 +25,4 @@ values ('email'), ('print'), ('sms'), -('feed'), ('phone'); --- a/installer/data/mysql/ru-RU/mandatory/message_transport_types.sql +++ a/installer/data/mysql/ru-RU/mandatory/message_transport_types.sql @@ -6,5 +6,4 @@ values ('email'), ('print'), ('sms'), -('feed'), ('phone'); --- a/installer/data/mysql/uk-UA/mandatory/message_transport_types.sql +++ a/installer/data/mysql/uk-UA/mandatory/message_transport_types.sql @@ -6,5 +6,4 @@ values ('email'), ('print'), ('sms'), -('feed'), ('phone'); --- a/installer/data/mysql/updatedatabase.pl +++ a/installer/data/mysql/updatedatabase.pl @@ -8603,6 +8603,36 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.15.00.XXX"; +if ( CheckVersion($DBversion) ) { + my $count_l = $dbh->selectcol_arrayref(q| + SELECT COUNT(*) FROM letter WHERE message_transport_type='feed' + |); + my $count_mq = $dbh->selectcol_arrayref(q| + SELECT COUNT(*) FROM message_queue WHERE message_transport_type='feed' + |); + my $count_ott = $dbh->selectcol_arrayref(q| + SELECT COUNT(*) FROM overduerules_transport_types WHERE message_transport_type='feed' + |); + my $count_mt = $dbh->selectcol_arrayref(q| + SELECT COUNT(*) FROM message_transports WHERE message_transport_type='feed' + |); + my $count_bmtp = $dbh->selectcol_arrayref(q| + SELECT COUNT(*) FROM borrower_message_transport_preferences WHERE message_transport_type='feed' + |); + + my $deleted = 0; + if ( $count_l->[0] == 0 and $count_mq->[0] == 0 and $count_ott->[0] == 0 and $count_mt->[0] == 0 and $count_bmtp->[0] == 0 ) { + $deleted = $dbh->do(q| + DELETE FROM message_transport_types where message_transport_type='feed' + |); + $deleted = $deleted ne '0E0' ? 1 : 0; + } + + print "Upgrade to $DBversion done (Bug 12298: Delete the 'feed' message transport type " . ($deleted ? '(deleted!)' : '(not deleted)') . ")\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) --