From 7205a02a19885d3a1baaab56c8e8749635501104 Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Fri, 12 Apr 2019 02:36:26 +0000 Subject: [PATCH] Bug 21890: DBRev 18.12.00.044 Signed-off-by: Nick Clemens --- Koha.pm | 2 +- .../bug_21890_pwd_reset_by_category.perl | 14 -------------- installer/data/mysql/updatedatabase.pl | 15 +++++++++++++++ 3 files changed, 16 insertions(+), 15 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_21890_pwd_reset_by_category.perl diff --git a/Koha.pm b/Koha.pm index a03bc65db6..98986b2c3e 100644 --- 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 index b2b6a38e43..0000000000 --- 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 165fe27250..6fde5dad56 100755 --- 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. -- 2.39.5