From fae4342fdfec11f8c4a1a340ed23d1a0b6d7cdab Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Tue, 6 Sep 2016 10:40:46 +0100 Subject: [PATCH] Bug 14637: Fix add patron category under MySQL 5.7 If no dateofbirthrequired or upperagelimit is set on the interface, the ->store method will receive an empty string defined for these values. For INT field, we must explicitely set these empty value to undef instead to avoid MySQL 5.7 (and strict mode) to raise: DBD::mysql::st execute failed: Incorrect integer value: ' for column 'dateofbirthrequired'' Test plan: Using MySQL 5.7 (and/or sql_mode=STRICT_TRANS_TABLES) Create a patron category without specifying upperagelimit or dateofbirthrequired Signed-off-by: Josef Moravec Signed-off-by: Kyle M Hall Signed-off-by: Kyle M Hall (cherry picked from commit a28334aeceba9ea8fcfcd301c4c01f473110bbe3) Signed-off-by: Katrin Fischer --- Koha/Patron/Category.pm | 21 +++++++++++++++++++++ 1 file changed, 21 insertions(+) diff --git a/Koha/Patron/Category.pm b/Koha/Patron/Category.pm index b1244d5726..5a456b7164 100644 --- a/Koha/Patron/Category.pm +++ b/Koha/Patron/Category.pm @@ -50,6 +50,27 @@ sub effective_BlockExpiredPatronOpacActions { return $self->BlockExpiredPatronOpacActions } +=head3 store + +=cut + +sub store { + my ($self) = @_; + + $self->dateofbirthrequired(undef) + if not defined $self->dateofbirthrequired + or $self->dateofbirthrequired eq ''; + + $self->upperagelimit(undef) + if not defined $self->upperagelimit + or $self->upperagelimit eq ''; + + $self->checkprevcheckout('inherit') + unless defined $self->checkprevcheckout; + + return $self->SUPER::store; +} + =head3 default_messaging my $messaging = $category->default_messaging(); -- 2.39.5