From a02882ffba7258cc897168ffc9fdf78687852379 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 --- 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 db90d6d5c5..28b9cfc6ce 100755 --- a/installer/data/mysql/updatedatabase.pl +++ b/installer/data/mysql/updatedatabase.pl @@ -12320,9 +12320,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')|); @@ -12384,12 +12381,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.11.0