Koha-community/Koha
13
7
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'bug_10185' into 3.14-master

Browse source
This commit is contained in:
Jared Camins-Esakov 2013-05-08 10:00:53 -04:00
commit 061f4a2f34
1 changed files with 9 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
installer/data/mysql/updatedatabase.pl
View file

@ -5486,13 +5486,15 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
constrainttype, branchcode, notificationdate, constrainttype, branchcode, notificationdate,
reminderdate, cancellationdate, reservenotes, reminderdate, cancellationdate, reservenotes,
priority, found, timestamp, itemnumber, priority, found, timestamp, itemnumber,
waitingdate, expirationdate, lowestPriority waitingdate, expirationdate, lowestPriority,
suspend, suspend_until
) SELECT ) SELECT
borrowernumber, reservedate, biblionumber, borrowernumber, reservedate, biblionumber,
constrainttype, branchcode, notificationdate, constrainttype, branchcode, notificationdate,
reminderdate, cancellationdate, reservenotes, reminderdate, cancellationdate, reservenotes,
priority, found, timestamp, itemnumber, priority, found, timestamp, itemnumber,
waitingdate, expirationdate, lowestPriority waitingdate, expirationdate, lowestPriority,
suspend, suspend_until
FROM old_reserves ORDER BY reservedate FROM old_reserves ORDER BY reservedate
"); ");
$dbh->do('SET @ai = ( SELECT MAX( reserve_id ) FROM tmp_reserves )'); $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, constrainttype, branchcode, notificationdate,
reminderdate, cancellationdate, reservenotes, reminderdate, cancellationdate, reservenotes,
priority, found, timestamp, itemnumber, priority, found, timestamp, itemnumber,
waitingdate, expirationdate, lowestPriority waitingdate, expirationdate, lowestPriority,
suspend, suspend_until
) SELECT ) SELECT
borrowernumber, reservedate, biblionumber, borrowernumber, reservedate, biblionumber,
constrainttype, branchcode, notificationdate, constrainttype, branchcode, notificationdate,
reminderdate, cancellationdate, reservenotes, reminderdate, cancellationdate, reservenotes,
priority, found, timestamp, itemnumber, priority, found, timestamp, itemnumber,
waitingdate, expirationdate, lowestPriority waitingdate, expirationdate, lowestPriority,
suspend, suspend_until
FROM reserves ORDER BY reservedate FROM reserves ORDER BY reservedate
"); ");
$dbh->do('TRUNCATE reserves'); $dbh->do('TRUNCATE reserves');
$dbh->do('ALTER TABLE reserves ADD reserve_id INT( 11 ) NOT NULL AUTO_INCREMENT PRIMARY KEY FIRST'); $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('DROP TABLE tmp_reserves');
$dbh->do('COMMIT'); $dbh->do('COMMIT');