From c42654c76acd44dc17bcd07110259d0271b81af6 Mon Sep 17 00:00:00 2001 From: Fridolyn SOMERS Date: Wed, 20 Nov 2013 14:42:04 +0100 Subject: [PATCH][SIGNED OFF] Bug 6331 - Obsolete marc column in deleteditems Content-Type: text/plain; charset="utf-8" There is a difference between "items" and "deleteditems" tables in "kohastructure.sql" : "deleteditems" has a field "marc" not existing in "items". This patch removes this obsolete column. === Test : - suppressing an item, checking the deleted item is properly stored in deleteditems table - checking the column marc has been deleted from deleteditems table Signed-off-by: Mathieu Saby --- installer/data/mysql/kohastructure.sql | 1 - installer/data/mysql/updatedatabase.pl | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 07160c8..8bcb74b 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -912,7 +912,6 @@ CREATE TABLE `deleteditems` ( `enumchron` text default NULL, -- serial enumeration/chronology for the item (MARC21 952$h) `copynumber` varchar(32) default NULL, -- copy number (MARC21 952$t) `stocknumber` varchar(32) default NULL, -- inventory number (MARC21 952$i) - `marc` longblob, -- unused in Koha PRIMARY KEY (`itemnumber`), KEY `delitembarcodeidx` (`barcode`), KEY `delitemstocknumberidx` (`stocknumber`), diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index a9bfbbf..2c9813f 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7778,6 +7778,13 @@ if(CheckVersion($DBversion)) { SetVersion($DBversion); } +$DBversion = "3.15.00.XXX"; +if(CheckVersion($DBversion)) { + $dbh->do("ALTER TABLE deleteditems DROP COLUMN marc"); + print "Upgrade to $DBversion done (Bug 6331: Obsolete marc column in deleteditems)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) -- 1.7.9.5