Bug 18801: DBRev 17.05.00.003

(cherry picked from commit 83e4adf0abff0e81febf4bcee473ce9c599e8311)

diff --git a/Koha.pm b/Koha.pm
index a387f9a..ce1e8c4 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 = "17.05.05.001";
+$VERSION = "17.05.05.002";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug18801.perl b/installer/data/mysql/atomicupdate/bug18801.perl
deleted file mode 100644 (file)
index 8a8fd50..0000000
--- a/installer/data/mysql/atomicupdate/bug18801.perl
+++ /dev/null
@@ -1,15 +0,0 @@
-$DBversion = 'XXX';  # will be replaced by the RM
-if( CheckVersion( $DBversion ) ) {
-    # Fetch all auth types
-    my $authtypes = $dbh->selectcol_arrayref( q|SELECT authtypecode FROM auth_types| );
-
-    if( grep { $_ eq 'Default' } @$authtypes ) {
-        # If this exists as an authtypecode, we don't do anything
-    } else {
-        # Replace the incorrect Default by empty string
-        $dbh->do( q|UPDATE auth_header SET authtypecode='' WHERE authtypecode='Default'| );
-    }
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 18801 - Update incorrect Default auth type codes)\n";
-}

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 39bf716..f57d78a 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -14561,6 +14561,27 @@ if( CheckVersion( $DBversion ) ) {
     print "Upgrade to $DBversion done (Bug 18811 - Visibility settings inconsistent between framework and authority editor)\n";
 }
 
+$DBversion = '17.05.05.002';
+if ( CheckVersion($DBversion) ) {
+
+    # Fetch all auth types
+    my $authtypes = $dbh->selectcol_arrayref(q|SELECT authtypecode FROM auth_types|);
+
+    if ( grep { $_ eq 'Default' } @$authtypes ) {
+
+        # If this exists as an authtypecode, we don't do anything
+    }
+    else {
+        # Replace the incorrect Default by empty string
+        $dbh->do(q|
+            UPDATE auth_header SET authtypecode='' WHERE authtypecode='Default'
+        |);
+    }
+
+    SetVersion($DBversion);
+    print "Upgrade to $DBversion done (Bug 18801 - Update incorrect Default auth type codes)\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.