From 0d4d3f388a816288034d4bc8393db79549a3cffe Mon Sep 17 00:00:00 2001
From: Nick Clemens <nick@bywatersolutions.com>
Date: Fri, 22 Jun 2018 21:59:35 +0000
Subject: [PATCH] Bug 20073: (RM follow-up) Remove atomicupdate

D'oh

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

diff --git a/Koha.pm b/Koha.pm
index 9a6a505..a025b10 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.06.00.002";
+$VERSION = "18.06.00.003";
 
 sub version {
     return $VERSION;
diff --git a/installer/data/mysql/atomicupdate/bug_20073.perl b/installer/data/mysql/atomicupdate/bug_20073.perl
deleted file mode 100644
index 0fd4b45..0000000
--- a/installer/data/mysql/atomicupdate/bug_20073.perl
+++ /dev/null
@@ -1,8 +0,0 @@
-$DBversion = 'XXX';  # will be replaced by the RM
-if( CheckVersion( $DBversion ) ) {
-    $dbh->do( "ALTER TABLE search_field CHANGE COLUMN type type ENUM('', 'string', 'date', 'number', 'boolean', 'sum', 'isbn', 'stdno') NOT NULL COMMENT 'what type of data this holds, relevant when storing it in the search engine'" );
-
-    # Always end with this (adjust the bug info)
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 20073 - Add new types for Elasticsearch fields)\n";
-}
diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 479b67e..b09399e 100755
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -16080,6 +16080,13 @@ if( CheckVersion( $DBversion ) ) {
     print "Upgrade to $DBversion done (Bug 2426 - Remove deprecated management permission)\n";
 }
 
+$DBversion = '18.06.00.003';
+if( CheckVersion( $DBversion ) ) {
+    $dbh->do( "ALTER TABLE search_field CHANGE COLUMN type type ENUM('', 'string', 'date', 'number', 'boolean', 'sum', 'isbn', 'stdno') NOT NULL COMMENT 'what type of data this holds, relevant when storing it in the search engine'" );
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 20073 - Add new types for Elasticsearch fields)\n";
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.
 
-- 
2.1.4