From 9f9cc7afbe3bff9cf72090f9520e856cab5562bb Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Wed, 8 Jan 2020 14:21:23 +0000 Subject: [PATCH] Bug 24263: DBRev 19.12.00.006 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug_24215.perl | 10 ---------- installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 3 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_24215.perl diff --git a/Koha.pm b/Koha.pm index abbd65b3c5..3ddffbc130 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 = "19.12.00.005"; +$VERSION = "19.12.00.006"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_24215.perl b/installer/data/mysql/atomicupdate/bug_24215.perl deleted file mode 100644 index 2cde433d45..0000000000 --- a/installer/data/mysql/atomicupdate/bug_24215.perl +++ /dev/null @@ -1,10 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - $dbh->do( q| - UPDATE borrowers SET relationship = NULL - WHERE relationship = "" - |); - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 24215 - Replace relationship with NULL when empty string)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 7ee8476169..370281210f 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -20312,6 +20312,17 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 24329 - Do not update action_log.timestamp)\n"; } +$DBversion = '19.12.00.006'; +if( CheckVersion( $DBversion ) ) { + $dbh->do( q| + UPDATE borrowers SET relationship = NULL + WHERE relationship = "" + |); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 24263 - Replace relationship with NULL when empty string)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. my $update_dir = C4::Context->config('intranetdir') . '/installer/data/mysql/atomicupdate/'; -- 2.39.5