From aa0bd18ff1c098a5becaf936d0f187dfec45fa46 Mon Sep 17 00:00:00 2001 From: Jonathan Druart Date: Fri, 7 Dec 2018 16:49:00 -0300 Subject: [PATCH] Bug 21931: Do not reset the ES mapping on 3.23.00.050 This update DB entry uses DBIx schema which does not make it crashes if the table structure is changed. Which happens on 18.06.00.054, that added search_field.weight The entry 3.23.00.050 fails with Unknown column 'me.weight' in 'field list' This patch removes the reset of the mapping and display a warning to tell the administrator the mapping must be reset/inserted Test plan: Use a 3.22 dump and upgrade it Signed-off-by: Kyle M Hall Signed-off-by: Martin Renvoize Signed-off-by: Nick Clemens (cherry picked from commit e29f0bce403d5d7c1f292d57b105e0a2ab31e01d) Signed-off-by: Martin Renvoize (cherry picked from commit 1fdc679955feb2357c8e897040f9d29cc3df930d) Signed-off-by: Lucas Gass (cherry picked from commit b89e7f3a2741390ca1acf7f254f058883d7b957c) Signed-off-by: Fridolin Somers --- installer/data/mysql/updatedatabase.pl | 11 +++-------- 1 file changed, 3 insertions(+), 8 deletions(-) diff --git a/installer/data/mysql/updatedatabase.pl b/installer/data/mysql/updatedatabase.pl index 5cf3bd453e..da53e38970 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -12321,9 +12321,6 @@ if ( $column_has_been_used ) { $DBversion = "3.23.00.050"; if ( CheckVersion($DBversion) ) { - use Koha::SearchMarcMaps; - use Koha::SearchFields; - use Koha::SearchEngine::Elasticsearch; $dbh->do(q|INSERT IGNORE INTO systempreferences (variable,value,explanation,options,type) VALUES('SearchEngine','Zebra','Choose Search Engine','','Choice')|); @@ -12385,12 +12382,10 @@ $dbh->do(q| ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci |); - # Insert default mappings - Koha::SearchEngine::Elasticsearch->reset_elasticsearch_mappings; - -print "Upgrade to $DBversion done (Bug 12478 - Elasticsearch support for Koha)\n"; + print "WARNING: If you plan to use Elasticsearch you should go to 'Home › Administration › Search engine configuration' and reset the mappings\n"; + print "Upgrade to $DBversion done (Bug 12478 - Elasticsearch support for Koha)\n"; SetVersion($DBversion); - } +} $DBversion = "3.23.00.051"; -- 2.39.5