From 3fb268cd4bb6723daa72ce46c08cefc02e788acc Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Thu, 3 Sep 2020 11:58:14 +0200 Subject: [PATCH] Bug 26365: Remove comparison with 0000-00-00 for datecancellationprinted Using MySQL 8: t/db_dependent/Koha/Acquisition/Order.t .. 10/11 No method count found for Koha::Acquisition::Orders DBIx::Class::Storage::DBI::_dbh_execute(): DBI Exception: DBD::mysql::st execute failed: Incorrect DATE value: '0000-00-00' [for Statement "SELECT COUNT( * ) FROM `aqorders` `me` WHERE ( ( ( `datecancellationprinted` IS NULL OR `datecancellationprinted` = ? ) AND `ordernumber` IN ( ?, ?, ? ) ) )" with ParamValues: 0='0000-00-00', 1=23, 2=24, 3=25] at /kohadevbox/koha/Koha/Objects.pm line 597 We must remove the comparison with 0000-00-00 Highlighted by bug 23166. I wanted to provide a DB rev but we (obviously) cannot: MySQL [koha_kohadev]> UPDATE aqorders SET datecancellationprinted=NULL WHERE datecancellationprinted="0000-00-00"; ERROR 1292 (22007): Incorrect date value: '0000-00-00' for column 'datecancellationprinted' at row 1 Signed-off-by: Tomas Cohen Arazi Signed-off-by: Martin Renvoize Signed-off-by: Jonathan Druart --- Koha/Acquisition/Orders.pm | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/Koha/Acquisition/Orders.pm b/Koha/Acquisition/Orders.pm index 28b8fb80fe..b8ee2f7d65 100644 --- a/Koha/Acquisition/Orders.pm +++ b/Koha/Acquisition/Orders.pm @@ -142,7 +142,7 @@ sub filter_by_current { my ($self) = @_; return $self->search( { - datecancellationprinted => [ undef, '0000-00-00' ] + datecancellationprinted => undef, } ); } @@ -159,8 +159,7 @@ sub filter_by_cancelled { my ($self) = @_; return $self->search( { - datecancellationprinted => - [ { '!=' => [ -and => ( undef, '0000-00-00' ) ] } ] + datecancellationprinted => { '!=' => undef } } ); } -- 2.39.5