Bug 18173 - DBRev 16.12.00.019

Signed-off-by: Kyle M Hall <kyle@bywatersolutions.com>

diff --git a/Koha.pm b/Koha.pm
index 361d1f0..06500c2 100644 (file)
--- 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 = "16.12.00.018";
+$VERSION = "16.12.00.019";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_18173.perl b/installer/data/mysql/atomicupdate/bug_18173.perl
deleted file mode 100644 (file)
index ea42d68..0000000
--- a/installer/data/mysql/atomicupdate/bug_18173.perl
+++ /dev/null
@@ -1,13 +0,0 @@
-$DBversion = 'XXX';
-if( CheckVersion( $DBversion ) ) {
-    if ( column_exists( 'issues', 'return' ) ) {
-        $dbh->do(q|ALTER TABLE issues DROP column `return`|);
-    }
-
-    if ( column_exists( 'old_issues', 'return' ) ) {
-        $dbh->do(q|ALTER TABLE old_issues DROP column `return`|);
-    }
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 18173 - Remove issues.return DB field)\n";
-}

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 9f283a1..d24dbd7 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -14034,6 +14034,20 @@ if ( CheckVersion($DBversion) ) {
     SetVersion($DBversion);
 }
 
+$DBversion = "16.12.00.019";
+if( CheckVersion( $DBversion ) ) {
+    if ( column_exists( 'issues', 'return' ) ) {
+        $dbh->do(q|ALTER TABLE issues DROP column `return`|);
+    }
+
+    if ( column_exists( 'old_issues', 'return' ) ) {
+        $dbh->do(q|ALTER TABLE old_issues DROP column `return`|);
+    }
+
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 18173 - Remove issues.return DB field)\n";
+}
+
 # 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.