changeset 37a409b66d14 in trytond:6.0
details: https://hg.tryton.org/trytond?cmd=changeset&node=37a409b66d14
description:
Use the same heuristic to compute full text search config for both
operation
issue11130
review395301002
(grafted from da8abbdcd4e5af3d05bbd4c2bc2a7ee486bdbad9)
diffstat:
trytond/backend/postgresql/database.py | 21 ++++++++++-----------
1 files changed, 10 insertions(+), 11 deletions(-)
diffs (31 lines):
diff -r 7326cb868b7d -r 37a409b66d14 trytond/backend/postgresql/database.py
--- a/trytond/backend/postgresql/database.py Wed Feb 16 21:56:36 2022 +0100
+++ b/trytond/backend/postgresql/database.py Tue Feb 08 18:44:55 2022 +0100
@@ -603,17 +603,16 @@
version = self.get_version(connection)
finally:
self.put_connection(connection)
- if version >= (11, 0):
- ToTsQuery = WebsearchToTsQuery
- else:
- ToTsQuery = PlainToTsQuery
- if language:
- config_name = self._search_full_text_language(language)
- if not isinstance(query, TsQuery):
- query = ToTsQuery(config_name, query)
- else:
- if not isinstance(query, TsQuery):
- query = ToTsQuery(query)
+ if not isinstance(query, TsQuery):
+ if version >= (11, 0):
+ ToTsQuery = WebsearchToTsQuery
+ else:
+ ToTsQuery = PlainToTsQuery
+ if language:
+ config_name = self._search_full_text_language(language)
+ else:
+ config_name = 'simple'
+ query = ToTsQuery(config_name, query)
return query
def search_full_text(self, document, query):
