From 21807202d447c3ad91afe8e053b17724912298a0 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 18 Mar 2020 15:43:38 +0000 Subject: [PATCH] Bug 10269: DBRev 19.12.00.042 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_10269.perl | 9 --------- installer/data/mysql/updatedatabase.pl | 10 ++++++++++ 3 files changed, 11 insertions(+), 10 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_10269.perl diff --git a/Koha.pm b/Koha.pm index 9b62ff4951..ad01568352 100644 --- a/Koha.pm +++ b/Koha.pm @@ -29,7 +29,7 @@ use vars qw{ $VERSION }; # - #4 : the developer version. The 4th number is the database subversion. # used by developers when the database changes. updatedatabase take care of the changes itself # and is automatically called by Auth.pm when needed. -$VERSION = "19.12.00.041"; +$VERSION = "19.12.00.042"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_10269.perl b/installer/data/mysql/atomicupdate/bug_10269.perl deleted file mode 100644 index 0d52232169..0000000000 --- a/installer/data/mysql/atomicupdate/bug_10269.perl +++ /dev/null @@ -1,9 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - if (!column_exists('message_queue', 'reply_address')) { - $dbh->do('ALTER TABLE message_queue ADD COLUMN reply_address LONGTEXT AFTER from_address'); - } - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 22821 - Add reply_address to message_queue)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index babbd965e4..62b447cc14 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -21124,6 +21124,16 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 24722 - Enforce NOT NULL constraint for reserves.priority)\n"; } +$DBversion = '19.12.00.042'; +if( CheckVersion( $DBversion ) ) { + if (!column_exists('message_queue', 'reply_address')) { + $dbh->do('ALTER TABLE message_queue ADD COLUMN reply_address LONGTEXT AFTER from_address'); + } + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 22821 - Add reply_address to message_queue)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/'; -- 2.20.1