From ec5a5d6e72e4dfbc0a439cbaa9ee1b990c258361 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Thu, 3 Oct 2019 10:49:31 +0100 Subject: [PATCH] Bug 23686: DBRev 19.06.00.032 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../bug_23686_autocheck_onsitecheckout.perl | 10 ---------- installer/data/mysql/updatedatabase.pl | 11 +++++++++++ 3 files changed, 12 insertions(+), 11 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_23686_autocheck_onsitecheckout.perl diff --git a/Koha.pm b/Koha.pm index 2304bc46ad..20d233d7e3 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.06.00.032"; +$VERSION = "19.06.00.033"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_23686_autocheck_onsitecheckout.perl b/installer/data/mysql/atomicupdate/bug_23686_autocheck_onsitecheckout.perl deleted file mode 100644 index 99dc8c233d..0000000000 --- a/installer/data/mysql/atomicupdate/bug_23686_autocheck_onsitecheckout.perl +++ /dev/null @@ -1,10 +0,0 @@ -$DBversion = 'XXX'; -if( CheckVersion( $DBversion ) ) { - - $dbh->do(qq{ - INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES - ('OnSiteCheckoutAutoCheck','0','','Enable/Do not enable onsite checkout by default if last checkout was an onsite checkout','YesNo') - }); - SetVersion( $DBversion ); - print "Upgrade to $DBversion done (Bug 23686: Add OnSiteCheckoutAutoCheck system preference)\n"; -} diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 68c849b8a2..8c71f3e4c9 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -19578,6 +19578,17 @@ if ( CheckVersion($DBversion) ) { "Upgrade to $DBversion done (Bug 20589 - Add field boosting and use elastic query fields parameter instead of depricated _all)\n"; } +$DBversion = '19.06.00.033'; +if( CheckVersion( $DBversion ) ) { + + $dbh->do(qq{ + INSERT IGNORE INTO systempreferences (variable,value,options,explanation,type) VALUES + ('OnSiteCheckoutAutoCheck','0','','Enable/Do not enable onsite checkout by default if last checkout was an onsite checkout','YesNo') + }); + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 23686: Add OnSiteCheckoutAutoCheck system preference)\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