From b1f4707165f30b6afd2d545d32b69322cb5399f2 Mon Sep 17 00:00:00 2001
From: Brendan A Gallagher <brendan@bywatersolutions.com>
Date: Thu, 31 Mar 2016 15:08:02 +0000
Subject: [PATCH] DBrev updates for Bug 16007 - Correction of 'Remove columns
 branchcode,       categorytype from table overduerules_transport_types'

Signed-off-by: Brendan A Gallagher <brendan@bywatersolutions.com>
---
 Koha.pm                                            |  2 +-
 ...ck_into_table_overduerules_transport_types.perl |  7 -------
 installer/data/mysql/updatedatabase.pl             | 14 ++++++++++++++
 3 files changed, 15 insertions(+), 8 deletions(-)
 delete mode 100755 installer/data/mysql/atomicupdate/Bug_16007_adding_column_letternumber_back_into_table_overduerules_transport_types.perl

diff --git a/Koha.pm b/Koha.pm
index e39a4f3bdb..353e2ebbcf 100644
--- a/Koha.pm
+++ b/Koha.pm
@@ -29,7 +29,7 @@ use vars qw{ $VERSION };
 # - #4 : the developer version. The 4th number is the database subversion.
 #        used by developers when the database changes. updatedatabase take care of the changes itself
 #        and is automatically called by Auth.pm when needed.
-$VERSION = "3.23.00.040";
+$VERSION = "3.23.00.041";
 
 sub version {
     return $VERSION;
diff --git a/installer/data/mysql/atomicupdate/Bug_16007_adding_column_letternumber_back_into_table_overduerules_transport_types.perl b/installer/data/mysql/atomicupdate/Bug_16007_adding_column_letternumber_back_into_table_overduerules_transport_types.perl
deleted file mode 100755
index dc8e2119c4..0000000000
--- a/installer/data/mysql/atomicupdate/Bug_16007_adding_column_letternumber_back_into_table_overduerules_transport_types.perl
+++ /dev/null
@@ -1,7 +0,0 @@
-my $dbh = C4::Context->dbh;
-my ($print_error) = $dbh->{PrintError};
-$dbh->{RaiseError} = 0;
-$dbh->{PrintError} = 0;
-$dbh->do("ALTER TABLE overduerules_transport_types ADD COLUMN letternumber INT(1) NOT NULL DEFAULT 1 AFTER id");
-$dbh->{PrintError} = $print_error;
-print "Bug 16007: Make sure overduerules_transport_types.letternumber exists\n";
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index cbad1feb2f..22e86fc11a 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -12036,6 +12036,20 @@ if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "3.23.00.041";
+if ( C4::Context->preference("Version") < TransformToNum($DBversion) ) {
+
+    my $dbh = C4::Context->dbh;
+    my ($print_error) = $dbh->{PrintError};
+    $dbh->{RaiseError} = 0;
+    $dbh->{PrintError} = 0;
+    $dbh->do("ALTER TABLE overduerules_transport_types ADD COLUMN letternumber INT(1) NOT NULL DEFAULT 1 AFTER id");
+    $dbh->{PrintError} = $print_error;
+
+    print "Upgrade to $DBversion done (Bug 16007: Make sure overduerules_transport_types.letternumber exists)\n";
+    SetVersion($DBversion);
+}
+
 # DEVELOPER PROCESS, search for anything to execute in the db_update directory
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.
-- 
2.39.2