Bug 18177: DBRev 19.12.00.059

Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

diff --git a/Koha.pm b/Koha.pm
index 60ff637..82c8c9f 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 = "19.12.00.058";
+$VERSION = "19.12.00.059";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_18177.perl b/installer/data/mysql/atomicupdate/bug_18177.perl
deleted file mode 100644 (file)
index 61b0e5e..0000000
--- a/installer/data/mysql/atomicupdate/bug_18177.perl
+++ /dev/null
@@ -1,24 +0,0 @@
-$DBversion = 'XXX'; # will be replaced by the RM
-if( CheckVersion( $DBversion ) ) {
-
-    for my $column ( qw(othersupplier booksellerfax booksellerurl bookselleremail currency) ) {
-        if( column_exists( 'aqbooksellers', $column ) ) {
-            my ($count) = $dbh->selectrow_array(qq|
-                SELECT COUNT(*)
-                FROM aqbooksellers
-                WHERE $column IS NOT NULL AND $column <> ""
-            |);
-            if ( $count ) {
-                warn "Warning - Cannot remove column aqbooksellers.$column. At least one value exists";
-            } else {
-                $dbh->do(qq|
-                    ALTER TABLE aqbooksellers
-                    DROP COLUMN $column
-                |);
-            }
-        }
-    }
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 18177 - Remove some unused columns from aqbooksellers)\n";
-}

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 5bfea82..3230918 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -21365,6 +21365,30 @@ if( CheckVersion( $DBversion ) ) {
     NewVersion( $DBversion, 14715, "Add sysprefs numSearchResultsDropdown and OPACnumSearchResultsDropdown");
 }
 
+$DBversion = '19.12.00.059';
+if( CheckVersion( $DBversion ) ) {
+
+    for my $column ( qw(othersupplier booksellerfax booksellerurl bookselleremail currency) ) {
+        if( column_exists( 'aqbooksellers', $column ) ) {
+            my ($count) = $dbh->selectrow_array(qq|
+                SELECT COUNT(*)
+                FROM aqbooksellers
+                WHERE $column IS NOT NULL AND $column <> ""
+            |);
+            if ( $count ) {
+                warn "Warning - Cannot remove column aqbooksellers.$column. At least one value exists";
+            } else {
+                $dbh->do(qq|
+                    ALTER TABLE aqbooksellers
+                    DROP COLUMN $column
+                |);
+            }
+        }
+    }
+
+    NewVersion( $DBversion, 18177, "Remove some unused columns from aqbooksellers");
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.
 my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/';