From 3f01c8630aeead13ccd054de2eeca7b4eb3c221e Mon Sep 17 00:00:00 2001 From: Nick Clemens Date: Thu, 30 Aug 2018 10:59:58 +0000 Subject: [PATCH] Bug 21068: DBRev 18.06.00.021 Signed-off-by: Nick Clemens --- Koha.pm | 2 +- .../data/mysql/atomicupdate/bug_21068.perl | 17 ----------------- installer/data/mysql/updatedatabase.pl | 16 ++++++++++++++++ 3 files changed, 17 insertions(+), 18 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_21068.perl diff --git a/Koha.pm b/Koha.pm index 5d9e6e202c..d50702d1ac 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 = "18.06.00.020"; +$VERSION = "18.06.00.021"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_21068.perl b/installer/data/mysql/atomicupdate/bug_21068.perl deleted file mode 100644 index 46873a6be5..0000000000 --- a/installer/data/mysql/atomicupdate/bug_21068.perl +++ /dev/null @@ -1,17 +0,0 @@ -$DBversion = 'XXX'; # will be replaced by the RM -if( CheckVersion( $DBversion ) ) { - - my $dbh = C4::Context->dbh; - unless ( C4::Context->preference('NorwegianPatronDBEnable') ) { - $dbh->do(q| - DELETE FROM systempreferences - WHERE variable IN ('NorwegianPatronDBEnable', 'NorwegianPatronDBEndpoint', 'NorwegianPatronDBUsername', 'NorwegianPatronDBPassword', 'NorwegianPatronDBSearchNLAfterLocalHit') - |); - if ( TableExists('borrower_sync') ) { - $dbh->do(q|DROP TABLE borrower_sync|); - } - } - - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 21068 - Remove system preferences NorwegianPatronDB*)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 4fac0247b1..c168930d0c 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -16311,6 +16311,22 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 15524 - Set limit on maximum possible holds per patron by category)\n"; } +$DBversion = '18.06.00.021'; +if( CheckVersion( $DBversion ) ) { + my $dbh = C4::Context->dbh; + unless ( C4::Context->preference('NorwegianPatronDBEnable') ) { + $dbh->do(q| + DELETE FROM systempreferences + WHERE variable IN ('NorwegianPatronDBEnable', 'NorwegianPatronDBEndpoint', 'NorwegianPatronDBUsername', 'NorwegianPatronDBPassword', 'NorwegianPatronDBSearchNLAfterLocalHit') + |); + if ( TableExists('borrower_sync') ) { + $dbh->do(q|DROP TABLE borrower_sync|); + } + } + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 21068 - Remove system preferences NorwegianPatronDB*)\n"; +} + # SEE bug 13068 # if there is anything in the atomicupdate, read and execute it. -- 2.20.1