Merge branch 'bug_6428' into 3.12-master

This commit is contained in:
Jared Camins-Esakov 2012-11-13 09:48:16 -05:00
commit 765cebfbeb
3 changed files with 9 additions and 2 deletions

View file

@ -762,6 +762,7 @@ CREATE TABLE `deleteditems` (
`itemlost` tinyint(1) NOT NULL default 0, -- authorized value defining this item as lost (MARC21 952$1) `itemlost` tinyint(1) NOT NULL default 0, -- authorized value defining this item as lost (MARC21 952$1)
`wthdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0) `wthdrawn` tinyint(1) NOT NULL default 0, -- authorized value defining this item as withdrawn (MARC21 952$0)
`itemcallnumber` varchar(255) default NULL, -- call number for this item (MARC21 952$o) `itemcallnumber` varchar(255) default NULL, -- call number for this item (MARC21 952$o)
`coded_location_qualifier` varchar(10) default NULL, -- coded location qualifier(MARC21 952$f)
`issues` smallint(6) default NULL, -- number of times this item has been checked out `issues` smallint(6) default NULL, -- number of times this item has been checked out
`renewals` smallint(6) default NULL, -- number of times this item has been renewed `renewals` smallint(6) default NULL, -- number of times this item has been renewed
`reserves` smallint(6) default NULL, -- number of times this item has been placed on hold/reserved `reserves` smallint(6) default NULL, -- number of times this item has been placed on hold/reserved

View file

@ -6043,11 +6043,17 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
$DBversion = "3.09.00.064"; $DBversion = "3.09.00.064";
if (C4::Context->preference("Version") < TransformToNum($DBversion)) { if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
$dbh->do('ALTER TABLE items ADD coded_location_qualifier varchar(10) default NULL'); $dbh->do('ALTER TABLE items ADD coded_location_qualifier varchar(10) default NULL AFTER itemcallnumber');
print "Upgrade to $DBversion done (Bug 6428: Added coded_location_qualifier to the items table)\n"; print "Upgrade to $DBversion done (Bug 6428: Added coded_location_qualifier to the items table)\n";
SetVersion ($DBversion); SetVersion ($DBversion);
} }
$DBversion = "3.09.00.065";
if (C4::Context->preference("Version") < TransformToNum($DBversion)) {
$dbh->do('ALTER TABLE deleteditems ADD coded_location_qualifier varchar(10) default NULL AFTER itemcallnumber');
print "Upgrade to $DBversion done (Bug 6428: Added coded_location_qualifier to the deleteditems table)\n";
SetVersion ($DBversion);
}
=head1 FUNCTIONS =head1 FUNCTIONS

View file

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