From 21d9aa62a3f79ac594e2b92f0dcb644a7cf11ff8 Mon Sep 17 00:00:00 2001 From: Joy Nelson Date: Wed, 1 Apr 2020 20:50:17 +0000 Subject: [PATCH] Bug 22273: DBRev 19.11.04.002 Signed-off-by: Joy Nelson --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug22273.perl | 8 -------- installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 3 files changed, 12 insertions(+), 9 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug22273.perl diff --git a/Koha.pm b/Koha.pm index 01f148ab06..512b86f372 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.04.001"; +$VERSION = "19.11.04.0022"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug22273.perl b/installer/data/mysql/atomicupdate/bug22273.perl deleted file mode 100644 index 82d114b7b1..0000000000 --- a/installer/data/mysql/atomicupdate/bug22273.perl +++ /dev/null @@ -1,8 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do( q| -ALTER TABLE article_requests MODIFY COLUMN created_on timestamp NULL, MODIFY COLUMN updated_on timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() - |); - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 22273: Column article_requests.created_on should not be updated)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 40d6fa67bf..4ff898dfbf 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -20460,6 +20460,17 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 24103 - add DumpSearchQueryTemplate syspref)\n"; } +$DBversion = '19.11.04.002'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( q| + ALTER TABLE article_requests + MODIFY COLUMN created_on timestamp NULL, + MODIFY COLUMN updated_on timestamp NOT NULL DEFAULT current_timestamp() ON UPDATE current_timestamp() + |); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 22273: Column article_requests.created_on should not be updated)\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