From d1cb5f562e47be367bf17a8a689a378c88da954e Mon Sep 17 00:00:00 2001 From: Joy Nelson Date: Wed, 29 Apr 2020 20:43:09 +0000 Subject: [PATCH] Bug 20754: DBRev 19.11.05.002 Signed-off-by: Joy Nelson --- 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 b5f8f0a7ed..5f0115f47d 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.11.05.001"; +$VERSION = "19.11.05.002"; 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 3e92819a6a..1d2c9189d4 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -20482,6 +20482,18 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 25010: Fix typo in account_debit_type description)\n"; } +$DBversion = '19.11.05.002'; +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.2