From 17a9abe6b33d9a7c14cfedf7fb38f910a2b7497f Mon Sep 17 00:00:00 2001 From: Tomas Cohen Arazi Date: Mon, 17 Jul 2017 16:04:51 -0300 Subject: [PATCH] Bug 18936: (followup) Fix upgrade step --- installer/data/mysql/atomicupdate/bug_18936.perl | 72 ++++++++++++------------ 1 file changed, 36 insertions(+), 36 deletions(-) diff --git a/installer/data/mysql/atomicupdate/bug_18936.perl b/installer/data/mysql/atomicupdate/bug_18936.perl index 61b5fb9c6a..b420fce6f3 100644 --- a/installer/data/mysql/atomicupdate/bug_18936.perl +++ b/installer/data/mysql/atomicupdate/bug_18936.perl @@ -1,45 +1,45 @@ $DBversion = 'XXX'; # will be replaced by the RM if( CheckVersion( $DBversion ) ) { - my @columns = qw( - restrictedtype - rentaldiscount - fine - finedays - maxsuspensiondays - firstremind - chargeperiod - chargeperiod_charge_at - accountsent - issuelength - lengthunit - hardduedate - hardduedatecompare - renewalsallowed - renewalperiod - norenewalbefore - auto_renew - no_auto_renewal_after - no_auto_renewal_after_hard_limit - reservesallowed - holds_per_record - overduefinescap - cap_fine_to_replacement_price - onshelfholds - opacitemholds - article_requests - ); + my @columns = qw( + restrictedtype + rentaldiscount + fine + finedays + maxsuspensiondays + firstremind + chargeperiod + chargeperiod_charge_at + accountsent + issuelength + lengthunit + hardduedate + hardduedatecompare + renewalsallowed + renewalperiod + norenewalbefore + auto_renew + no_auto_renewal_after + no_auto_renewal_after_hard_limit + reservesallowed + holds_per_record + overduefinescap + cap_fine_to_replacement_price + onshelfholds + opacitemholds + article_requests + ); 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', $column - FROM issuingrules - "); - } + foreach my $column ( @columns ) { + $dbh->do(" + INSERT INTO circulation_rules ( categorycode, branchcode, itemtype, rule_name, rule_value ) + SELECT categorycode, branchcode, itemtype, \'$column\', $column + FROM issuingrules + "); + } $dbh->do("DROP TABLE issuingrules"); } SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 18930 - Move lost item refund rules to circulation_rules table)\n"; + print "Upgrade to $DBversion done (Bug 18936: Convert issuingrules fields to circulation_rules)\n"; } -- 2.15.1