gitea
/
Koha-clms
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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 <kyle@bywatersolutions.com>
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>

Signed-off-by: Nick Clemens <nick@bywatersolutions.com>
(cherry picked from commit e29f0bce40)
Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
(cherry picked from commit 1fdc679955)

Signed-off-by: Lucas Gass <lucas@bywatersolutions.com>
(cherry picked from commit b89e7f3a27)
Signed-off-by: Fridolin Somers <fridolin.somers@biblibre.com>
This commit is contained in:
Jonathan Druart 2018-12-07 16:49:00 -03:00 committed by Fridolin Somers
parent b74f4e9cce
commit aa0bd18ff1
1 changed files with 3 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
installer/data/mysql/updatedatabase.pl
View File

@ -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";