Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Bug 21610: Improve default values for dates

Browse source 
This patch fixes failures on t/db_dependent/Koha/Patrons/Import.t
and keep t/Auth_with_shibboleth.t and t/db_dependent/Koha/Object.t green

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>
Signed-off-by: Tomas Cohen Arazi <tomascohen@theke.io>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
This commit is contained in:
Jonathan Druart 2018-10-19 08:22:20 -03:00 committed by root
parent 0ee4e9e14f
commit 766eaa0df4
1 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
Koha/Object.pm
View file

@ -141,9 +141,13 @@ sub store {
}
elsif ( _date_or_datetime_column_type( $columns_info->{$col}->{data_type} ) ) {
# Set to null if an empty string (or == 0 but should not happen)
# Skip a default value for dates LIKE CURRENT_TIMESTAMP
# In DBIx represented as: default_value => \'now()'
$self->$col(undef) unless $self->$col || $columns_info->{$col}->{default_value};
if ( defined $self->$col and not $self->$col ) {
if ( $columns_info->{$col}->{is_nullable} ) {
$self->$col(undef);
} else {
$self->$col($columns_info->{$col}->{default_value});
}
}
}
}