From cf85d02daeba82507c3cdf1570c33480763cc58a Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Thu, 28 Mar 2019 18:02:35 +0000
Subject: [PATCH] Bug 22516: DBRev 18.12.00.034

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 Koha.pm                                          |  2 +-
 Koha/Schema/Result/Accountline.pm                | 12 ++----------
 installer/data/mysql/atomicupdate/bug_22516.perl | 10 ----------
 installer/data/mysql/updatedatabase.pl           | 11 +++++++++++
 4 files changed, 14 insertions(+), 21 deletions(-)
 delete mode 100644 installer/data/mysql/atomicupdate/bug_22516.perl

diff --git a/Koha.pm b/Koha.pm
index a4c26c193b..b19bfc9749 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 = "18.12.00.033";
+$VERSION = "18.12.00.034";
 
 sub version {
     return $VERSION;
diff --git a/Koha/Schema/Result/Accountline.pm b/Koha/Schema/Result/Accountline.pm
index 9b4505ed0f..aa204d4fa1 100644
--- a/Koha/Schema/Result/Accountline.pm
+++ b/Koha/Schema/Result/Accountline.pm
@@ -81,12 +81,6 @@ __PACKAGE__->table("accountlines");
   is_nullable: 1
   size: [28,6]
 
-=head2 lastincrement
-
-  data_type: 'decimal'
-  is_nullable: 1
-  size: [28,6]
-
 =head2 timestamp
 
   data_type: 'timestamp'
@@ -135,8 +129,6 @@ __PACKAGE__->add_columns(
   { data_type => "varchar", is_nullable => 1, size => 80 },
   "amountoutstanding",
   { data_type => "decimal", is_nullable => 1, size => [28, 6] },
-  "lastincrement",
-  { data_type => "decimal", is_nullable => 1, size => [28, 6] },
   "timestamp",
   {
     data_type => "timestamp",
@@ -277,8 +269,8 @@ __PACKAGE__->belongs_to(
 );
 
 
-# Created by DBIx::Class::Schema::Loader v0.07042 @ 2019-03-22 20:06:37
-# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:Op6tRrWF4pGrLcunNiXO+g
+# Created by DBIx::Class::Schema::Loader v0.07046 @ 2019-03-28 18:01:31
+# DO NOT MODIFY THIS OR ANYTHING ABOVE! md5sum:6TVweDBJR9SEra68zHn8fQ
 
 sub koha_objects_class {
     'Koha::Account::Lines';
diff --git a/installer/data/mysql/atomicupdate/bug_22516.perl b/installer/data/mysql/atomicupdate/bug_22516.perl
deleted file mode 100644
index e40c983ac7..0000000000
--- a/installer/data/mysql/atomicupdate/bug_22516.perl
+++ /dev/null
@@ -1,10 +0,0 @@
-$DBversion = 'XXX'; # will be replaced by the RM
-if( CheckVersion( $DBversion ) ) {
-
-    if ( column_exists( 'accountlines', 'lastincrement' ) ) {
-        $dbh->do("ALTER TABLE `accountlines` DROP COLUMN `lastincrement`");
-    }
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 22516 - Drop deprecated accountlines.lastincrement field)\n";
-}
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 7382aa8a31..58c0ab2857 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -17816,6 +17816,17 @@ if( CheckVersion( $DBversion ) ) {
     print "Upgrade to $DBversion done (Bug 18213 - Add language facets to Elasticsearch)\n";
 }
 
+$DBversion = '18.12.00.034';
+if( CheckVersion( $DBversion ) ) {
+
+    if ( column_exists( 'accountlines', 'lastincrement' ) ) {
+        $dbh->do("ALTER TABLE `accountlines` DROP COLUMN `lastincrement`");
+    }
+
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 22516 - Drop deprecated accountlines.lastincrement field)\n";
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.
 
-- 
2.39.5