Bug 21890: DBRev 18.12.00.044

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

diff --git a/Koha.pm b/Koha.pm
index a03bc65..98986b2 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.043";
+$VERSION = "18.12.00.044";
 
 sub version {
     return $VERSION;

diff --git a/installer/data/mysql/atomicupdate/bug_21890_pwd_reset_by_category.perl b/installer/data/mysql/atomicupdate/bug_21890_pwd_reset_by_category.perl
deleted file mode 100644 (file)
index b2b6a38..0000000
--- a/installer/data/mysql/atomicupdate/bug_21890_pwd_reset_by_category.perl
+++ /dev/null
@@ -1,14 +0,0 @@
-$DBversion = 'XXX';
-if( CheckVersion( $DBversion ) ) {
-
-    if ( !column_exists( 'categories', 'reset_password' ) ) {
-        $dbh->do(q{
-            ALTER TABLE categories
-                ADD COLUMN reset_password TINYINT(1) NULL DEFAULT NULL
-                AFTER checkprevcheckout
-        });
-    }
-
-    SetVersion( $DBversion );
-    print "Upgrade to $DBversion done (Bug 21890 - Patron password reset by category)\n";
-}

diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl
index 165fe27..6fde5da 100755 (executable)
--- a/installer/data/mysql/updatedatabase.pl
+++ b/installer/data/mysql/updatedatabase.pl
@@ -17975,6 +17975,21 @@ if ( CheckVersion($DBversion) ) {
     print "Upgrade to $DBversion done (Bug 21953 - Remove 'Lost Item' text from accountlines description)\n";
 }
 
+$DBversion = '18.12.00.044';
+if( CheckVersion( $DBversion ) ) {
+
+    if ( !column_exists( 'categories', 'reset_password' ) ) {
+        $dbh->do(q{
+            ALTER TABLE categories
+                ADD COLUMN reset_password TINYINT(1) NULL DEFAULT NULL
+                AFTER checkprevcheckout
+        });
+    }
+
+    SetVersion( $DBversion );
+    print "Upgrade to $DBversion done (Bug 21890 - Patron password reset by category)\n";
+}
+
 # SEE bug 13068
 # if there is anything in the atomicupdate, read and execute it.