From b6a4c6dc00830a7734dbf332e4838827e9a30855 Mon Sep 17 00:00:00 2001 From: Kyle M Hall Date: Fri, 17 Apr 2015 11:00:52 -0400 Subject: [PATCH] Bug 13790 [QA Followup] --- installer/data/mysql/updatedatabase.pl | 15 +++++++-------- 1 files changed, 7 insertions(+), 8 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 356e379..bb1b9a7 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -37,7 +37,6 @@ use Getopt::Long; use C4::Context; use C4::Installer; use C4::Dates; -use Koha::Database; use MARC::Record; use MARC::File::XML ( BinaryEncoding => 'utf8' ); @@ -10064,14 +10063,14 @@ if(CheckVersion($DBversion)) { UPDATE issues SET issue_id = issue_id + ( SELECT COUNT(*) FROM old_issues ) ORDER BY issue_id DESC }); - my $schema = Koha::Database->new()->schema(); + my $schema = Koha::Database->new()->schema(); my $max_issue_id = $schema->resultset('Issue')->get_column('issue_id')->max(); - $max_issue_id ||= $schema->resultset('OldIssue')->get_column('issue_id')->max(); - $max_issue_id ||= 0; - $max_issue_id++; - $dbh->do(qq{ - ALTER TABLE issues AUTO_INCREMENT = $max_issue_id} - ); + if ($max_issue_id) { + $max_issue_id++; + $dbh->do(qq{ + ALTER TABLE issues AUTO_INCREMENT = $max_issue_id + }); + } print "Upgrade to $DBversion done (Bug 13790 - Add unique id issue_id to issues and oldissues tables)\n"; SetVersion($DBversion); -- 1.7.2.5