From 61b407d6dcf8260cca83a2ded2a445b8cac1fd38 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 18 Jul 2014 12:54:28 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 11008: Drop column aqorders.supplierreference It seems that this column has never been used. Test plan: 1/ Execute the updatedatabase entry. 2/ git grep supplierreference should not return occurrence in the code (except in Koha/Schema/* 3/ prove t/db_dependent/Acquisition.t should return green. Signed-off-by: Nicolas Legrand --- installer/data/mysql/kohastructure.sql | 1 - installer/data/mysql/updatedatabase.pl | 9 +++++++++ t/db_dependent/Acquisition.t | 3 --- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index 4ffbbf2..a405e49 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -3055,7 +3055,6 @@ CREATE TABLE `aqorders` ( -- information related to the basket line items `cancellationreason` text default NULL, -- reason of cancellation `order_internalnote` mediumtext, -- notes related to this order line, made for staff `order_vendornote` mediumtext, -- notes related to this order line, made for vendor - `supplierreference` mediumtext, -- not used? always NULL `purchaseordernumber` mediumtext, -- not used? always NULL `basketno` int(11) default NULL, -- links this order line to a specific basket (aqbasket.basketno) `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP, -- the date and time this order line was last modified diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 8ad77c2..c071a2e 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -9531,6 +9531,15 @@ if( CheckVersion($DBversion) ){ $dbh->do("INSERT INTO systempreferences (variable, explanation, type) VALUES('DefaultLongOverdueLostValue', 'Set the LOST value of an item to n when the item has been overdue for more than defaultlongoverduedays days.', 'integer')"); $dbh->do("INSERT INTO systempreferences (variable, explanation, type) VALUES('DefaultLongOverdueDays', 'Set the LOST value of an item when the item has been overdue for more than n days.', 'integer')"); print "Upgrade to $DBversion done (Bug 8337: System preferences for longoverdue cron)\n"; +} + +$DBversion = "3.17.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q| + ALTER TABLE aqorders DROP COLUMN supplierreference; + |); + + print "Upgrade to $DBversion done (Bug 11008 - DROP column aqorders.supplierreference)\n"; SetVersion($DBversion); } diff --git a/t/db_dependent/Acquisition.t b/t/db_dependent/Acquisition.t index 27da4e0..ba5b732 100755 --- a/t/db_dependent/Acquisition.t +++ b/t/db_dependent/Acquisition.t @@ -339,7 +339,6 @@ my @expectedfields = qw( unitprice quantityreceived datecancellationprinted - supplierreference purchaseordernumber basketno timestamp @@ -457,7 +456,6 @@ my @base_expectedfields = qw( biblioitemnumber datereceived orderstatus - supplierreference agerestriction budget_branchcode gstrate @@ -578,7 +576,6 @@ ok( creationdate datereceived orderstatus - supplierreference isbn copyrightdate gstrate -- 1.7.10.4