From 2db8898d1119f81ab77440ee1db7803e981a5f36 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 8 Jan 2020 11:09:54 +0000 Subject: [PATCH] Bug 24329: DBRev 19.12.00.005 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_24329.perl | 8 -------- installer/data/mysql/updatedatabase.pl | 9 +++++++++ 3 files changed, 10 insertions(+), 9 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_24329.perl diff --git a/Koha.pm b/Koha.pm index 34a8f8ce62..abbd65b3c5 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.004"; +$VERSION = "19.12.00.005"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_24329.perl b/installer/data/mysql/atomicupdate/bug_24329.perl deleted file mode 100644 index 3d85aa519d..0000000000 --- a/installer/data/mysql/atomicupdate/bug_24329.perl +++ /dev/null @@ -1,8 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do( "ALTER TABLE action_logs MODIFY COLUMN `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP" ); - - # Always end with this (adjust the bug info) - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 24329 - Do not update action_log.timestamp)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 42f3c42550..7ee8476169 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -20303,6 +20303,15 @@ if ( CheckVersion($DBversion) ) { print "Upgrade to $DBversion done (Bug 24080 - Add accounts payout permission)\n"; } +$DBversion = '19.12.00.005'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( "ALTER TABLE action_logs MODIFY COLUMN `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP" ); + + # Always end with this (adjust the bug info) + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 24329 - Do not update action_log.timestamp)\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.11.4.GIT