From e7f08df1ddb68aeb24e0439de252e8dee0bb6857 Mon Sep 17 00:00:00 2001
From: Mark Tompsett <mtompset@hotmail.com>
Date: Wed, 12 Mar 2014 11:53:17 -0400
Subject: [PATCH] Bug 11928 - Remove unused table aqorderdelivery

Aqorderdelivery has apparently never been used. This patch
removes it.

TEST PLAN
---------
1) Apply patch.
2) Run the Koha QA Test tool.
3) Confirm table is there.
4) Run upgrade process.
5) Confirm table has been removed.
6) Drop koha database and create empty one.
7) Fresh install from staff client.
8) Confirm table was not created.
9) I'm unsure how to test the Schema's. It was just git rm'd.

Signed-off-by: Galen Charlton <gmc@esilibrary.com>
Signed-off-by: Jonathan Druart <jonathan.druart@biblibre.com>
Signed-off-by: Galen Charlton <gmc@esilibrary.com>
---
 Koha/Schema/Result/Aqorderdelivery.pm  | 75 --------------------------
 installer/data/mysql/kohastructure.sql | 13 -----
 installer/data/mysql/updatedatabase.pl |  9 ++++
 3 files changed, 9 insertions(+), 88 deletions(-)
 delete mode 100644 Koha/Schema/Result/Aqorderdelivery.pm

diff --git a/Koha/Schema/Result/Aqorderdelivery.pm b/Koha/Schema/Result/Aqorderdelivery.pm
deleted file mode 100644
index 453d8ffd2c..0000000000
--- a/Koha/Schema/Result/Aqorderdelivery.pm
+++ /dev/null
@@ -1,75 +0,0 @@
-use utf8;
-package Koha::Schema::Result::Aqorderdelivery;
-
-# Created by DBIx::Class::Schema::Loader
-# DO NOT MODIFY THE FIRST PART OF THIS FILE
-
-=head1 NAME
-
-Koha::Schema::Result::Aqorderdelivery
-
-=cut
-
-use strict;
-use warnings;
-
-use base 'DBIx::Class::Core';
-
-=head1 TABLE: C<aqorderdelivery>
-
-=cut
-
-__PACKAGE__->table("aqorderdelivery");
-
-=head1 ACCESSORS
-
-=head2 ordernumber
-
-  data_type: 'date'
-  datetime_undef_if_invalid: 1
-  is_nullable: 1
-
-=head2 deliverynumber
-
-  data_type: 'smallint'
-  default_value: 0
-  is_nullable: 0
-
-=head2 deliverydate
-
-  data_type: 'varchar'
-  is_nullable: 1
-  size: 18
-
-=head2 qtydelivered
-
-  data_type: 'smallint'
-  is_nullable: 1
-
-=head2 deliverycomments
-
-  data_type: 'mediumtext'
-  is_nullable: 1
-
-=cut
-
-__PACKAGE__->add_columns(
-  "ordernumber",
-  { data_type => "date", datetime_undef_if_invalid => 1, is_nullable => 1 },
-  "deliverynumber",
-  { data_type => "smallint", default_value => 0, is_nullable => 0 },
-  "deliverydate",
-  { data_type => "varchar", is_nullable => 1, size => 18 },
-  "qtydelivered",
-  { data_type => "smallint", is_nullable => 1 },
-  "deliverycomments",
-  { data_type => "mediumtext", is_nullable => 1 },
-);
-
-
-# Created by DBIx::Class::Schema::Loader v0.07025 @ 2013-10-14 20:56:21
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:hS/Ww/p7nHWiHNumkBifiQ
-
-
-# You can replace this text with custom content, and it will be preserved on regeneration
-1;
diff --git a/installer/data/mysql/kohastructure.sql b/installer/data/mysql/kohastructure.sql
index 6618d58cad..3cf9c65e80 100644
--- a/installer/data/mysql/kohastructure.sql
+++ b/installer/data/mysql/kohastructure.sql
@@ -2955,19 +2955,6 @@ CREATE TABLE `aqcontract` (
        REFERENCES `aqbooksellers` (`id`) ON DELETE CASCADE ON UPDATE CASCADE
 ) ENGINE=InnoDB DEFAULT CHARSET=utf8 AUTO_INCREMENT=1 ;
 
---
--- Table structure for table `aqorderdelivery`
---
-
-DROP TABLE IF EXISTS `aqorderdelivery`;
-CREATE TABLE `aqorderdelivery` (
-  `ordernumber` date default NULL,
-  `deliverynumber` smallint(6) NOT NULL default 0,
-  `deliverydate` varchar(18) default NULL,
-  `qtydelivered` smallint(6) default NULL,
-  `deliverycomments` mediumtext
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
-
 --
 -- Table structure for table `aqorders`
 --
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 78ba6ca223..fe674d5c8e 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -8065,6 +8065,15 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.15.00.XXX";
+if ( CheckVersion($DBversion) ) {
+    $dbh->do(q{
+        DROP TABLE aqorderdelivery;
+    });
+    print "Upgrade to $DBversion done (Bug 11928 - remove unused table)\n";
+    SetVersion($DBversion);
+}
+
 =head1 FUNCTIONS
 
 =head2 TableExists($table)
-- 
2.20.1