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

Merge remote-tracking branch 'kc/new/bug_5860' into kcmaster

Browse source
This commit is contained in:
Chris Cormack 2011-06-13 11:46:12 +12:00
commit 21c8a87b78
1 changed files with 26 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -4216,13 +4216,27 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
}
$DBversion = '3.03.00.042';
if (C4::Context->preference("Version") < TransformToNum($DBversion) && $original_version < TransformToNum("3.02.06.001")) {
$dbh->do("ALTER TABLE `items` DROP INDEX `itemsstocknumberidx`;");
$dbh->do("ALTER TABLE items ADD INDEX itemstocknumberidx (stocknumber);");
print "Upgrade to $DBversion done (Change items.stocknumber to be not unique)\n";
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
stocknumber_checker();
print "Upgrade to $DBversion done (5860 Index itemstocknumber)\n";
SetVersion ($DBversion);
}
sub stocknumber_checker { #code reused later on
my @row;
#drop the obsolete itemSStocknumber idx if it exists
@row = $dbh->selectrow_array("SHOW INDEXES FROM items WHERE key_name='itemsstocknumberidx'");
$dbh->do("ALTER TABLE `items` DROP INDEX `itemsstocknumberidx`;") if @row;
#check itemstocknumber idx; remove it if it is unique
@row = $dbh->selectrow_array("SHOW INDEXES FROM items WHERE key_name='itemstocknumberidx' AND non_unique=0");
$dbh->do("ALTER TABLE `items` DROP INDEX `itemstocknumberidx`;") if @row;
#add itemstocknumber index non-unique IF it still not exists
@row = $dbh->selectrow_array("SHOW INDEXES FROM items WHERE key_name='itemstocknumberidx'");
$dbh->do("ALTER TABLE items ADD INDEX itemstocknumberidx (stocknumber);") unless @row;
}
$DBversion = "3.03.00.043";
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
@ -4332,6 +4346,14 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
SetVersion($DBversion);
}
$DBversion = '3.05.00.XXX';
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
#follow up fix 5860: some installs already past 3.3.0.42
stocknumber_checker();
print "Upgrade to $DBversion done (Fix for stocknumber index)\n";
SetVersion ($DBversion);
}
=head1 FUNCTIONS
=head2 DropAllForeignKeys($table)