Bug 21683: DBRev 18.12.00.030

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>

diff --git a/Koha.pm b/Koha.pm
index 5a73491..df5ad38 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 = "18.12.00.029";
+$VERSION = "18.12.00.030";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_21683_remove_column_accountno.perl b/installer/data/mysql/atomicupdate/bug_21683_remove_column_accountno.perl
deleted file mode 100644 (file)
index 4d044c8..0000000
--- a/installer/data/mysql/atomicupdate/bug_21683_remove_column_accountno.perl
+++ /dev/null
@@ -1,15 +0,0 @@
-$DBversion = 'XXX';  # will be replaced by the RM
-if( CheckVersion( $DBversion ) ) {
-
-    if( column_exists( 'accountlines', 'accountno' ) ) {
-        $dbh->do( "ALTER TABLE accountlines DROP COLUMN accountno" );
-    }
-
-    if( column_exists( 'statistics', 'proccode' ) ) {
-        $dbh->do( "ALTER TABLE statistics DROP COLUMN proccode" );
-    }
-
-    # Always end with this (adjust the bug info)
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 21683 - Remove accountlines.accountno and statistics.proccode fields)\n";
-}

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 38dc17d..527c5ce 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -17759,6 +17759,18 @@ if( CheckVersion( $DBversion ) ) {
     print "Upgrade to $DBversion done (Bug 18736 - Add syspref to control order rounding)\n";
 }
 
+$DBversion = '18.12.00.030';
+if( CheckVersion( $DBversion ) ) {
+    if( column_exists( 'accountlines', 'accountno' ) ) {
+        $dbh->do( "ALTER TABLE accountlines DROP COLUMN accountno" );
+    }
+    if( column_exists( 'statistics', 'proccode' ) ) {
+        $dbh->do( "ALTER TABLE statistics DROP COLUMN proccode" );
+    }
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 21683 - Remove accountlines.accountno and statistics.proccode fields)\n";
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.