From f3242901ff4f4613e0a654a33a0f31f3f7d921b0 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 18 Jul 2014 12:48:57 +0200 Subject: [PATCH] [SIGNED-OFF] Bug 11007: Drop column aqorders.cancelledby It seems that this column has never been used. Test plan: 1/ Execute the updatedatabase entry. 2/ git grep cancelledby should not return occurrence in the code (except in Koha/Schema/* 3/ prove t/db_dependent/Acquisition.t should return green. Signed-off-by: Srdjan --- installer/data/mysql/kohastructure.sql | 1 - installer/data/mysql/updatedatabase.pl | 10 ++++++++++ t/db_dependent/Acquisition.t | 3 --- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql index b46dc6a..6d81594 100644 --- a/installer/data/mysql/kohastructure.sql +++ b/installer/data/mysql/kohastructure.sql @@ -3002,7 +3002,6 @@ CREATE TABLE `aqorders` ( -- information related to the basket line items `freight` decimal(28,6) default NULL, -- shipping costs (not used) `unitprice` decimal(28,6) default NULL, -- the actual cost entered when receiving this line item `quantityreceived` smallint(6) NOT NULL default 0, -- the quantity that have been received so far - `cancelledby` varchar(10) default NULL, -- not used? always NULL `datecancellationprinted` date default NULL, -- the date the line item was deleted `order_internalnote` mediumtext, -- notes related to this order line, made for staff `order_vendornote` mediumtext, -- notes related to this order line, made for vendor diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index de77bf3..3a4df9c 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -8613,6 +8613,16 @@ if ( CheckVersion($DBversion) ) { SetVersion($DBversion); } +$DBversion = "3.17.00.XXX"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q| + ALTER TABLE aqorders DROP COLUMN cancelledby; + |); + + print "Upgrade to $DBversion done (Bug 11007 - DROP column aqorders.cancelledby)\n"; + SetVersion($DBversion); +} + =head1 FUNCTIONS =head2 TableExists($table) diff --git a/t/db_dependent/Acquisition.t b/t/db_dependent/Acquisition.t index 837024a..064c66b 100755 --- a/t/db_dependent/Acquisition.t +++ b/t/db_dependent/Acquisition.t @@ -363,7 +363,6 @@ my @expectedfields = qw( freight unitprice quantityreceived - cancelledby datecancellationprinted supplierreference purchaseordernumber @@ -439,7 +438,6 @@ my @base_expectedfields = qw( ecost uncertainprice marc - cancelledby url isbn copyrightdate @@ -604,7 +602,6 @@ ok( datereceived orderstatus supplierreference - cancelledby isbn copyrightdate gstrate -- 1.9.1