From c80ced404fa0eff291509b42280c81b7d23d0ad6 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Mon, 6 Apr 2020 12:28:36 +0100 Subject: [PATCH] Bug 20754: DBRev 19.12.00.067 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug20754.perl | 11 ---------- installer/data/mysql/updatedatabase.pl | 20 +++++++++++++++++++ 3 files changed, 21 insertions(+), 12 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug20754.perl diff --git a/Koha.pm b/Koha.pm index f33b2170f6..d3b6f92fe1 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.066"; +$VERSION = "19.12.00.067"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug20754.perl b/installer/data/mysql/atomicupdate/bug20754.perl deleted file mode 100644 index b819674141..0000000000 --- a/installer/data/mysql/atomicupdate/bug20754.perl +++ /dev/null @@ -1,11 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - # From: https://stackoverflow.com/questions/3311903/remove-duplicate-rows-in-mysql - $dbh->do(q| -DELETE a -FROM virtualshelfshares as a, virtualshelfshares as b -WHERE a.id < b.id AND a.borrowernumber IS NOT NULL AND a.borrowernumber=b.borrowernumber AND a.shelfnumber=b.shelfnumber - |); - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 20754: Remove double accepted list shares)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index b4e115865a..686817e71b 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -21510,6 +21510,26 @@ q{INSERT IGNORE INTO permissions (module_bit, code, description) VALUES (26, 'ma ); } +$DBversion = '19.12.00.067'; +if( CheckVersion( $DBversion ) ) { + # From: https://stackoverflow.com/questions/3311903/remove-duplicate-rows-in-mysql + $dbh->do(q| + DELETE a + FROM virtualshelfshares as a, virtualshelfshares as b + WHERE + a.id < b.id + AND + a.borrowernumber IS NOT NULL + AND + a.borrowernumber=b.borrowernumber + AND + a.shelfnumber=b.shelfnumber + |); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 20754: Remove double accepted list shares)\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