Attachment 83171 Details for Bug 21931 – Bug 21931: Do not reset the ES mapping on 3.23.00.050

[patch] Bug 21931: Do not reset the ES mapping on 3.23.00.050

Bug-21931-Do-not-reset-the-ES-mapping-on-32300050.patch (text/plain), 2.12 KB, created by Martin Renvoize (ashimema) on 2018-12-13 14:29:34 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Renvoize (ashimema)

Created: 2018-12-13 14:29:34 UTC

Size: 2.12 KB

patch

obsolete

>From df97c2e12cf1daad6c528f73e8b93c1597103a6b Mon Sep 17 00:00:00 2001
>From: Jonathan Druart <jonathan.druart@bugs.koha-community.org>
>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 <kyle@bywatersolutions.com>
>Signed-off-by: Martin Renvoize <martin.renvoize@ptfs-europe.com>
>---
> 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 fa2bb39926..350b8eb237 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.19.2

Actions: View | Diff | Splinter Review

Attachments on bug 21931: 82822 | 83001 | 83166 | 83171