From 6e37d51cbc84b0c192b2892e9b72a1b50bc0e444 Mon Sep 17 00:00:00 2001 From: Fridolin Somers Date: Fri, 27 Oct 2017 14:11:11 +0200 Subject: [PATCH] Bug 19344: DBRev 17.05.05.003 Signed-off-by: Fridolin Somers --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_19344.sql | 2 -- installer/data/mysql/updatedatabase.pl | 13 +++++++++++++ 3 files changed, 14 insertions(+), 3 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_19344.sql diff --git a/Koha.pm b/Koha.pm index ce1e8c4ad0..8ff5ea449c 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 = "17.05.05.002"; +$VERSION = "17.05.05.003"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_19344.sql b/installer/data/mysql/atomicupdate/bug_19344.sql deleted file mode 100644 index 36faba834a..0000000000 --- a/installer/data/mysql/atomicupdate/bug_19344.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE borrowers MODIFY COLUMN login_attempts int(4) AFTER lang; -ALTER TABLE deletedborrowers MODIFY COLUMN login_attempts int(4) AFTER lang; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index f57d78ad61..12ba9c2190 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -14582,6 +14582,19 @@ if ( CheckVersion($DBversion) ) { print "Upgrade to $DBversion done (Bug 18801 - Update incorrect Default auth type codes)\n"; } +$DBversion = '17.05.05.003'; +if( CheckVersion( $DBversion ) ) { + $dbh->do(q{ + ALTER TABLE borrowers MODIFY COLUMN login_attempts int(4) AFTER lang; + }); + $dbh->do(q{ + ALTER TABLE deletedborrowers MODIFY COLUMN login_attempts int(4) AFTER lang; + }); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 19344 - Reorder lang and login_attempts in the [deleted]borrowers tables)\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. -- 2.11.4.GIT