From 613f9c835f2f4d30e1d91912b59223def23e2b2a Mon Sep 17 00:00:00 2001 From: Joy Nelson Date: Sat, 18 Jan 2020 15:30:32 +0000 Subject: [PATCH] Bug 24329: DBRev 19.11.01.002 Signed-off-by: Joy Nelson --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_24329.perl | 8 -------- installer/data/mysql/updatedatabase.pl | 7 +++++++ 3 files changed, 8 insertions(+), 9 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_24329.perl diff --git a/Koha.pm b/Koha.pm index 91552231aa..fe761c3945 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.01.001"; +$VERSION = "19.11.01.002"; 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 b0229fa9d2..4c888e5270 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -20252,6 +20252,13 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 23233 - Rename AllowItemsOnHoldCheckout syspref)\n"; } +$DBversion = '19.11.01.002'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( "ALTER TABLE action_logs MODIFY COLUMN `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP" ); + 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.20.1