gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'bug_9030' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2012-11-28 18:46:18 -05:00
parent 6f283a5a36 fc5f9034b6
commit 9aa1969a04
3 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
installer/data/mysql/kohastructure.sql
View File

@ -2824,7 +2824,8 @@ CREATE TABLE `aqorders_items` ( -- information on items entered in the acquisiti
`itemnumber` int(11) NOT NULL, -- the item number for this item (items.itemnumber)
`timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this order item was last touched
PRIMARY KEY (`itemnumber`),
KEY `ordernumber` (`ordernumber`)
KEY `ordernumber` (`ordernumber`),
CONSTRAINT aqorders_items_ibfk_1 FOREIGN KEY (ordernumber) REFERENCES aqorders (ordernumber) ON DELETE CASCADE ON UPDATE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

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

@ -6083,6 +6083,20 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
SetVersion($DBversion);
}
$DBversion = "3.11.00.002";
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
$dbh->do(q{
DELETE from aqorders_items where ordernumber NOT IN (SELECT ordernumber FROM aqorders);
});
$dbh->do(q{
ALTER TABLE aqorders_items
ADD CONSTRAINT aqorders_items_ibfk_1 FOREIGN KEY (ordernumber) REFERENCES aqorders (ordernumber)
ON DELETE CASCADE ON UPDATE CASCADE;
});
print "Upgrade to $DBversion done (Bug 9030: Add constraint on aqorders_items.ordernumber)\n";
SetVersion ($DBversion);
}
=head1 FUNCTIONS
=head2 TableExists($table)

2
kohaversion.pl
View File

@ -16,7 +16,7 @@ the kohaversion is divided in 4 parts :
use strict;
sub kohaversion {
our $VERSION = '3.11.00.001';
our $VERSION = '3.11.00.002';
# version needs to be set this way
# so that it can be picked up by Makefile.PL
# during install