From b5474b7f95dca834640e086ed17b1a2223722168 Mon Sep 17 00:00:00 2001 From: Paul Poulain Date: Wed, 21 Nov 2012 13:46:59 +0100 Subject: [PATCH] Bug 9064: fix statistics.ccode column From updatedatabase.pl: $dbh->do("ALTER TABLE statistics ADD COLUMN ccode VARCHAR ( 10 ) NULL AFTER associatedborrower"); From kohastructure.sql: `ccode` int(11) default NULL, -- foreign key from the items table, links transaction to a specific collection code The variant in updatedatabase.pl is probably what was wanted. This patch fixes the kohastructure and add another updatedatabase.pl, in case someone has a broken install. This should not happen, because 3.10.0 still not released, but just in case... Signed-off-by: Kyle M Hall Passed-QA-by: Jonathan Druart Signed-off-by: Jared Camins-Esakov --- installer/data/mysql/kohastructure.sql | 2 +- installer/data/mysql/updatedatabase.pl | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index c0d9936fcd..cc9fb21e1d 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -1850,7 +1850,7 @@ CREATE TABLE `statistics` ( -- information related to transactions (circulation `itemtype` varchar(10) default NULL, -- foreign key from the itemtypes table, links transaction to a specific item type `borrowernumber` int(11) default NULL, -- foreign key from the borrowers table, links transaction to a specific borrower `associatedborrower` int(11) default NULL, - `ccode` int(11) default NULL, -- foreign key from the items table, links transaction to a specific collection code + `ccode` varchar(10) default NULL, -- foreign key from the items table, links transaction to a specific collection code KEY `timeidx` (`datetime`) ) ENGINE=InnoDB DEFAULT CHARSET=utf8; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 964df0c6af..31bfc883b8 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -6062,6 +6062,13 @@ if (C4::Context->preference("Version") < TransformToNum($DBversion)) { SetVersion ($DBversion); } +$DBversion = "3.09.00.XXX"; +if (C4::Context->preference("Version") < TransformToNum($DBversion)) { + $dbh->do("ALTER TABLE statistics CHANGE COLUMN ccode ccode varchar(10) NULL"); + print "Upgrade to $DBversion done (Bug 9064: statistics.ccode potentially wrongly defined)\n"; + SetVersion ($DBversion); +} + =head1 FUNCTIONS -- 2.39.5