From 6d4eb48dd47599dfd9738e1ae125abfa9f1109ee Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Wed, 10 Apr 2019 19:55:14 +0000
Subject: [PATCH] Bug 22600: DBRev 18.12.00.039

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
---
 Koha.pm                                       |  2 +-
 .../data/mysql/atomicupdate/bug_22600.perl    | 52 ------------------
 installer/data/mysql/updatedatabase.pl        | 53 +++++++++++++++++++
 3 files changed, 54 insertions(+), 53 deletions(-)
 delete mode 100644 installer/data/mysql/atomicupdate/bug_22600.perl

diff --git a/Koha.pm b/Koha.pm
index d876743148..20da074d6c 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.038";
+$VERSION = "18.12.00.039";
 
 sub version {
     return $VERSION;
diff --git a/installer/data/mysql/atomicupdate/bug_22600.perl b/installer/data/mysql/atomicupdate/bug_22600.perl
deleted file mode 100644
index d33e0a7451..0000000000
--- a/installer/data/mysql/atomicupdate/bug_22600.perl
+++ /dev/null
@@ -1,52 +0,0 @@
-$DBversion = 'XXX';    # will be replaced by the RM
-if ( CheckVersion($DBversion) ) {
-
-    if ( !column_exists( 'accountlines', 'interface' ) ) {
-        $dbh->do(
-            qq{
-            ALTER TABLE `accountlines`
-            ADD
-              `interface` varchar(16)
-            AFTER
-              `manager_id`;
-          }
-        );
-    }
-
-    $dbh->do(qq{
-        UPDATE
-          `accountlines`
-        SET
-          interface = 'opac'
-        WHERE
-          borrowernumber = manager_id;
-    });
-
-    $dbh->do(qq{
-        UPDATE
-          `accountlines`
-        SET
-          interface = 'cron'
-        WHERE
-          manager_id IS NULL
-        AND
-          branchcode IS NULL;
-    });
-
-    $dbh->do(qq{
-        UPDATE
-          `accountlines`
-        SET
-          interface = 'intranet'
-        WHERE
-          interface IS NULL;
-    });
-
-    $dbh->do(qq{
-        ALTER TABLE `accountlines`
-        MODIFY COLUMN `interface` varchar(16) NOT NULL;
-    });
-
-    SetVersion($DBversion);
-    print "Upgrade to $DBversion done (Bug 22600 - Add interface to accountlines)\n";
-}
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 1abe2ecab5..d2cb81e54a 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -17886,6 +17886,59 @@ if ( CheckVersion($DBversion) ) {
     print "Upgrade to $DBversion done (Bug 22512 - Add status to accountlines)\n";
 }
 
+$DBversion = '18.12.00.039';
+if ( CheckVersion($DBversion) ) {
+
+    if ( !column_exists( 'accountlines', 'interface' ) ) {
+        $dbh->do(
+            qq{
+            ALTER TABLE `accountlines`
+            ADD
+              `interface` varchar(16)
+            AFTER
+              `manager_id`;
+          }
+        );
+    }
+
+    $dbh->do(qq{
+        UPDATE
+          `accountlines`
+        SET
+          interface = 'opac'
+        WHERE
+          borrowernumber = manager_id;
+    });
+
+    $dbh->do(qq{
+        UPDATE
+          `accountlines`
+        SET
+          interface = 'cron'
+        WHERE
+          manager_id IS NULL
+        AND
+          branchcode IS NULL;
+    });
+
+    $dbh->do(qq{
+        UPDATE
+          `accountlines`
+        SET
+          interface = 'intranet'
+        WHERE
+          interface IS NULL;
+    });
+
+    $dbh->do(qq{
+        ALTER TABLE `accountlines`
+        MODIFY COLUMN `interface` varchar(16) NOT NULL;
+    });
+
+    SetVersion($DBversion);
+    print "Upgrade to $DBversion done (Bug 22600 - Add interface to accountlines)\n";
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.
 
-- 
2.39.5