[#5974] Fix datastore_search language parameter

amercader · amercader · commit 16f069f7bebf · 2021-05-10T11:41:52.000+02:00
diff --git a/ckanext/datastore/backend/postgres.py b/ckanext/datastore/backend/postgres.py
@@ -394,7 +394,7 @@ def _where_clauses(data_dict, fields_types):
             clause_str = u'_full_text @@ {0}'.format(ts_query_alias)
             clauses.append((clause_str,))
         elif isinstance(q, dict):
-            lang = _fts_lang(data_dict.get('lang'))
+            lang = _fts_lang(data_dict.get('language'))
             for field, value in q.iteritems():
                 if field not in fields_types:
                     continue
@@ -416,7 +416,7 @@ def _where_clauses(data_dict, fields_types):
 
 def _textsearch_query(data_dict):
     q = data_dict.get('q')
-    lang = _fts_lang(data_dict.get('lang'))
+    lang = _fts_lang(data_dict.get('language'))
 
     if not q:
         return '', ''
@@ -580,7 +580,7 @@ def _build_fts_indexes(connection, data_dict, sql_index_str_method, fields):
     default_fts_lang = config.get('ckan.datastore.default_fts_lang')
     if default_fts_lang is None:
         default_fts_lang = u'english'
-    fts_lang = data_dict.get('lang', default_fts_lang)
+    fts_lang = data_dict.get('language', default_fts_lang)
 
     # create full-text search indexes
     def to_tsvector(x):
diff --git a/ckanext/datastore/tests/test_db.py b/ckanext/datastore/tests/test_db.py
@@ -106,7 +106,7 @@ def test_creates_fts_index_on_textual_fields_can_overwrite_lang_using_lang_param
         resource_id = 'resource_id'
         data_dict = {
             'resource_id': resource_id,
-            'lang': 'french',
+            'language': 'french',
         }
 
         db.create_indexes(context, data_dict)
diff --git a/ckanext/datastore/tests/test_plugin.py b/ckanext/datastore/tests/test_plugin.py
@@ -88,7 +88,7 @@ def test_lang_parameter_overwrites_default_fts_lang(self):
         expected_ts_query = ', plainto_tsquery(\'french\', \'foo\') "query"'
         data_dict = {
             'q': 'foo',
-            'lang': 'french',
+            'language': 'french',
         }
 
         result = self._datastore_search(data_dict=data_dict)
@@ -99,7 +99,7 @@ def test_fts_rank_column_uses_lang_when_casting_to_tsvector(self):
         expected_select_content = u'to_tsvector(\'french\', cast("country" as text))'
         data_dict = {
             'q': {'country': 'Brazil'},
-            'lang': 'french',
+            'language': 'french',
         }
 
         result = self._datastore_search(data_dict=data_dict)
@@ -163,7 +163,7 @@ def test_fts_where_clause_lang_can_be_overwritten_using_lang_param(self):
                            u' @@ "query country"',)]
         data_dict = {
             'q': {'country': 'Brazil'},
-            'lang': 'french',
+            'language': 'french',
         }
         fields_types = {
             'country': 'text',
@@ -182,7 +182,7 @@ def test_fts_adds_where_clause_on_full_text_when_querying_non_indexed_fields(sel
                            u' @@ "query country"',)]
         data_dict = {
             'q': {'country': 'Brazil'},
-            'lang': 'english',
+            'language': 'english',
         }
         fields_types = {
             'country': 'non-indexed field type',

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ def test_creates_fts_index_on_textual_fields_can_overwrite_lang_using_lang_param`
`106`	`106`	`resource_id = 'resource_id'`
`107`	`107`	`data_dict = {`
`108`	`108`	`'resource_id': resource_id,`
`109`		`- 'lang': 'french',`
	`109`	`+ 'language': 'french',`
`110`	`110`	`}`
`111`	`111`
`112`	`112`	`db.create_indexes(context, data_dict)`