X-Git-Url: http://koha-dev.rot13.org:8081/gitweb/?a=blobdiff_plain;f=installer%2Fdata%2Fmysql%2Fupdatedatabase.pl;h=1b88ccccf9bb3f4c44aa3da0e9dfcca58d4851bb;hb=835f745b55c47ccc7087950419b68d036b908cc2;hp=d6c18d1864a7bc65510f24557e9497ed5215ecda;hpb=bf04e2974deddbcd6e4396e155dfcbf209b3da44;p=koha_fer diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index d6c18d1864..1b88ccccf9 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -5486,13 +5486,15 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { constrainttype, branchcode, notificationdate, reminderdate, cancellationdate, reservenotes, priority, found, timestamp, itemnumber, - waitingdate, expirationdate, lowestPriority + waitingdate, expirationdate, lowestPriority, + suspend, suspend_until ) SELECT borrowernumber, reservedate, biblionumber, constrainttype, branchcode, notificationdate, reminderdate, cancellationdate, reservenotes, priority, found, timestamp, itemnumber, - waitingdate, expirationdate, lowestPriority + waitingdate, expirationdate, lowestPriority, + suspend, suspend_until FROM old_reserves ORDER BY reservedate "); $dbh->do('SET @ai = ( SELECT MAX( reserve_id ) FROM tmp_reserves )'); @@ -5505,18 +5507,20 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { constrainttype, branchcode, notificationdate, reminderdate, cancellationdate, reservenotes, priority, found, timestamp, itemnumber, - waitingdate, expirationdate, lowestPriority + waitingdate, expirationdate, lowestPriority, + suspend, suspend_until ) SELECT borrowernumber, reservedate, biblionumber, constrainttype, branchcode, notificationdate, reminderdate, cancellationdate, reservenotes, priority, found, timestamp, itemnumber, - waitingdate, expirationdate, lowestPriority + waitingdate, expirationdate, lowestPriority, + suspend, suspend_until FROM reserves ORDER BY reservedate "); $dbh->do('TRUNCATE reserves'); $dbh->do('ALTER TABLE reserves ADD reserve_id INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST'); - $dbh->do('INSERT INTO reserves SELECT * FROM tmp_reserves WHERE reserve_id > @ai'); + $dbh->do('INSERT INTO reserves SELECT * FROM tmp_reserves WHERE reserve_id > COALESCE(@ai, 0)'); $dbh->do('DROP TABLE tmp_reserves'); $dbh->do('COMMIT'); @@ -5557,7 +5561,7 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { $DBversion = '3.09.00.027'; if (C4::Context->preference("Version") < TransformToNum($DBversion)) { - $dbh->do("ALTER TABLE issuingrules ADD overduefinescap decimal DEFAULT NULL"); + $dbh->do("ALTER TABLE issuingrules ADD overduefinescap decimal(28,6) DEFAULT NULL"); my $maxfine = C4::Context->preference('MaxFine'); if ($maxfine && $maxfine < 900) { # an arbitrary value that tells us it's not "some huge value" $dbh->do("UPDATE issuingrules SET overduefinescap=?",undef,$maxfine); @@ -5797,7 +5801,6 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { SetVersion($DBversion); } - $DBversion = "3.09.00.047"; if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) { # to preserve default behaviour as best as possible, set this new preference differently depending on whether IndependantBranches is set or not @@ -5828,8 +5831,6 @@ if(C4::Context->preference("Version") < TransformToNum($DBversion) ) { SetVersion($DBversion); } - - $DBversion = "3.09.00.050"; if (C4::Context->preference("Version") < TransformToNum($DBversion)) { $dbh->do("ALTER TABLE authorised_values MODIFY category varchar(16) NOT NULL DEFAULT '';"); @@ -6336,7 +6337,6 @@ if ( CheckVersion($DBversion) ) { $dbh->do("INSERT INTO systempreferences ( variable, value, explanation, type ) VALUES ( 'SCOUserCSS', '', 'Add CSS to be included in the SCO module in an embedded