From 0e9b39eee807e4328d044b112857123b5ce1d715 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Sun, 4 Aug 2019 15:06:00 -0500 Subject: [PATCH] Bug 18936: Fix Update DB entry MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Minna Kivinen Signed-off-by: Joonas Kylmälä --- installer/data/mysql/atomicupdate/bug_18936.perl | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_18936.perl b/installer/data/mysql/atomicupdate/bug_18936.perl index 935f71844c..160c5b167f 100644 --- a/installer/data/mysql/atomicupdate/bug_18936.perl +++ b/installer/data/mysql/atomicupdate/bug_18936.perl @@ -6,6 +6,7 @@ if( CheckVersion( $DBversion ) ) { fine finedays maxsuspensiondays + suspension_chargeperiod firstremind chargeperiod chargeperiod_charge_at @@ -22,20 +23,20 @@ if( CheckVersion( $DBversion ) ) { no_auto_renewal_after_hard_limit reservesallowed holds_per_record - overduefinescap - cap_fine_to_replacement_price + holds_per_day onshelfholds opacitemholds + overduefinescap + cap_fine_to_replacement_price article_requests - maxissueqty - maxonsiteissueqty + note ); if ( column_exists( 'issuingrules', 'categorycode' ) ) { foreach my $column ( @columns ) { $dbh->do(" INSERT INTO circulation_rules ( categorycode, branchcode, itemtype, rule_name, rule_value ) - SELECT categorycode, branchcode, itemtype, \'$column\', COALESCE( $column, '' ) + SELECT IF(categorycode='*', NULL, categorycode), IF(branchcode='*', NULL, branchcode), IF(itemtype='*', NULL, itemtype), \'$column\', COALESCE( $column, '' ) FROM issuingrules "); } -- 2.11.0