From 5b1c56c7b5b4a23ce1d8cba8ab41276ec07b7add Mon Sep 17 00:00:00 2001 From: Joy Nelson Date: Thu, 5 Mar 2020 01:50:40 +0000 Subject: [PATCH] Bug 24640: DBRev 19.11.03.002 Signed-off-by: Joy Nelson --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_24640.perl | 7 ------- installer/data/mysql/updatedatabase.pl | 9 +++++++++ 3 files changed, 10 insertions(+), 8 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_24640.perl diff --git a/Koha.pm b/Koha.pm index d1b81bc9c7..4236c8ed23 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.11.03.001"; +$VERSION = "19.11.03.002"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_24640.perl b/installer/data/mysql/atomicupdate/bug_24640.perl deleted file mode 100644 index 393c049343..0000000000 --- a/installer/data/mysql/atomicupdate/bug_24640.perl +++ /dev/null @@ -1,7 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do( "ALTER TABLE quotes MODIFY timestamp datetime NULL" ); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 24640 - Allow quotes.timestamp to be NULL)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index f4d05840c4..4a979b1d74 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -20364,6 +20364,15 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 20882 - items.uri to MEDIUMTEXT)\n"; } +$DBversion = '19.11.03.002'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( "ALTER TABLE quotes MODIFY timestamp datetime NULL" ); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 24640 - Allow quotes.timestamp to be NULL)\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.39.5