From e061b2b65cd0cfa1f9e1b51e9d7ea0550c2b6a4f Mon Sep 17 00:00:00 2001 From: Brendan Gallagher Date: Tue, 23 Feb 2016 23:13:08 +0000 Subject: [PATCH] DBRev for Bug 15517 - Tables borrowers and deletedborrowers differ again --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_15517.sql | 2 -- installer/data/mysql/updatedatabase.pl | 12 ++++++++++++ 3 files changed, 13 insertions(+), 3 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_15517.sql diff --git a/Koha.pm b/Koha.pm index fc563165ea..49a834c4cf 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 = "3.23.00.023"; +$VERSION = "3.23.00.024"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_15517.sql b/installer/data/mysql/atomicupdate/bug_15517.sql deleted file mode 100644 index d2b459e570..0000000000 --- a/installer/data/mysql/atomicupdate/bug_15517.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE deletedborrowers MODIFY COLUMN userid VARCHAR(75) DEFAULT NULL; -ALTER TABLE deletedborrowers MODIFY COLUMN password VARCHAR(60) DEFAULT NULL; diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index ca62a38d59..5588aa57de 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -11795,6 +11795,18 @@ VALUES('OpenLibrarySearch','0','If Yes Open Library search results will show in print "Upgrade to $DBversion done (Bug 6624 - Allow Koha to use the new read API from OpenLibrary)\n"; SetVersion($DBversion); } + +$DBversion = "3.23.00.024"; +if ( CheckVersion($DBversion) ) { + $dbh->do(q{ + ALTER TABLE deletedborrowers MODIFY COLUMN userid VARCHAR(75) DEFAULT NULL; +}); + $dbh->do(q{ + ALTER TABLE deletedborrowers MODIFY COLUMN password VARCHAR(60) DEFAULT NULL; +}); + print "Upgrade to $DBversion done (Bug 15517 - Tables borrowers and deletedborrowers differ again)\n"; + SetVersion($DBversion); +} # 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.39.5