From 0f293662c37f76408ac2c4b952c6160dbdb9f014 Mon Sep 17 00:00:00 2001 From: Lucas Gass Date: Mon, 11 May 2020 21:27:29 +0000 Subject: [PATCH] Bug 20754: DBRev 19.05.11.001 Signed-off-by: Lucas Gass --- Koha.pm | 2 +- installer/data/mysql/atomicupdate/bug20754.perl | 11 ----------- installer/data/mysql/updatedatabase.pl | 12 ++++++++++++ 3 files changed, 13 insertions(+), 12 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug20754.perl diff --git a/Koha.pm b/Koha.pm index 373cf9a826..48546f3aa8 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.05.10.000"; +$VERSION = "19.05.10.001"; 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 a5fec56e71..e75bf28d27 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -19029,6 +19029,18 @@ if ( CheckVersion($DBversion) ) { SetVersion ($DBversion); } +$DBversion = '19.05.10.001'; +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. -- 2.20.1