From 172a4836bf4cf142db2a49a24b0e56a5f0952d72 Mon Sep 17 00:00:00 2001 From: Martin Renvoize Date: Tue, 8 Oct 2019 14:13:59 +0100 Subject: [PATCH] Bug 20334: DBRev 19.06.00.036 Signed-off-by: Martin Renvoize --- Koha.pm | 2 +- .../bug_20334-add-syspref-QueryRegexEscapeOptions.sql | 1 - installer/data/mysql/updatedatabase.pl | 12 ++++++++++++ 3 files changed, 13 insertions(+), 2 deletions(-) delete mode 100644 installer/data/mysql/atomicupdate/bug_20334-add-syspref-QueryRegexEscapeOptions.sql diff --git a/Koha.pm b/Koha.pm index 13aa950f35..1ffe3d33c5 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.035"; +$VERSION = "19.06.00.036"; sub version { return $VERSION; diff --git a/installer/data/mysql/atomicupdate/bug_20334-add-syspref-QueryRegexEscapeOptions.sql b/installer/data/mysql/atomicupdate/bug_20334-add-syspref-QueryRegexEscapeOptions.sql deleted file mode 100644 index e43d1c377c..0000000000 --- a/installer/data/mysql/atomicupdate/bug_20334-add-syspref-QueryRegexEscapeOptions.sql +++ /dev/null @@ -1 +0,0 @@ -INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type`) VALUES ('QueryRegexEscapeOptions', 'escape', 'dont_escape|escape|unescape_escaped', 'Escape option for regexps delimiters in Elasicsearch queries.', 'Choice'); diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 220b57ca20..53fbea3fc4 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -19619,6 +19619,18 @@ if( CheckVersion( $DBversion ) ) { print "Upgrade to $DBversion done (Bug 18421: Add Coce image cache to the Intranet)\n"; } +$DBversion = '19.06.00.036'; +if( CheckVersion( $DBversion ) ) { + + $dbh->do(q{ + INSERT IGNORE INTO systempreferences ( `variable`, `value`, `options`, `explanation`, `type`) VALUES + ('QueryRegexEscapeOptions', 'escape', 'dont_escape|escape|unescape_escaped', 'Escape option for regexps delimiters in Elasicsearch queries.', 'Choice') + }); + + SetVersion( $DBversion ); + print "Upgrade to $DBversion done (Bug 20334: Add elasticsearch escape options 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.11.4.GIT