From 1ed5ca50e2a6c3b5dc390490368ec1d23fc5626c Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Fri, 13 Jul 2018 10:49:10 +0100 Subject: [PATCH] Bug 20773: (followup) Remove MySQLism --- installer/data/mysql/atomicupdate/bug_20724.perl | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_20724.perl b/installer/data/mysql/atomicupdate/bug_20724.perl index ffdb1dc73c..d93d30433f 100644 --- a/installer/data/mysql/atomicupdate/bug_20724.perl +++ b/installer/data/mysql/atomicupdate/bug_20724.perl @@ -1,7 +1,10 @@ $DBversion = 'XXX'; # will be replaced by the RM if( CheckVersion( $DBversion ) ) { - my $sql = q|UPDATE reserves SET expirationdate = DATE_ADD( NOW(), INTERVAL ? DAY) WHERE expirationdate IS NULL AND waitingdate IS NOT NULL|; - $dbh->do( $sql, undef, C4::Context->preference('MaxPickupDelay') || 7 ); + my $dtf = Koha::Database->new->schema->storage->datetime_parser; + my $days = C4::Context->preference('MaxPickupDelay') || 7; + my $date = DateTime->now()->add( days => $days ); + my $sql = q|UPDATE reserves SET expirationdate = ? WHERE expirationdate IS NULL AND waitingdate IS NOT NULL|; + $dbh->do( $sql, undef, $dtf->format_datetime($date) ); SetVersion( $DBversion ); print "Upgrade to $DBversion done (Bug 20724 - expirationdate filled for waiting holds)\n"; -- 2.17.1