From e1fb1a658c89ef1356d3b42e264efed71cf81f9f Mon Sep 17 00:00:00 2001 From: Fridolyn SOMERS Date: Wed, 20 Nov 2013 14:42:04 +0100 Subject: [PATCH] Bug 6331: remove obsolete column deleteditems.marc 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 : - after deleting an item, check that the deleted item is properly stored in deleteditems table - check that the column marc has been deleted from deleteditems table Signed-off-by: Mathieu Saby Signed-off-by: Kyle M Hall Signed-off-by: Galen Charlton --- 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 728d7ca367..136104f04b 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -917,7 +917,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 ff2b27aae6..cc1fc6da76 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -7868,6 +7868,13 @@ if ( CheckVersion($DBversion) ) { ALTER TABLE suggestions MODIFY suggesteddate DATE NOT NULL }); print "Upgrade to $DBversion done (Bug 11391) - drop default value on suggestions.suggesteddate column)\n"; + 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); } -- 2.11.4.GIT