changeset dca4b68762db in trytond:6.2
details: https://hg.tryton.org/trytond?cmd=changeset&node=dca4b68762db
description:
Do not order on NULL when rank column is None
It is not valid to use NULL in ORDER BY clause.
issue10947
review381411002
(grafted from 449158110f20a1cb2d96d140c7e9b91ba95bbe1f)
diffstat:
trytond/model/fields/text.py | 10 +++++-----
1 files changed, 5 insertions(+), 5 deletions(-)
diffs (24 lines):
diff -r e81588dd7ee4 -r dca4b68762db trytond/model/fields/text.py
--- a/trytond/model/fields/text.py Fri Nov 19 23:54:57 2021 +0100
+++ b/trytond/model/fields/text.py Fri Nov 19 23:56:36 2021 +0100
@@ -49,10 +49,7 @@
if value and database.has_search_full_text():
value = database.format_full_text_query(
value, language=transaction.language)
- column = database.rank_full_text(column, value, normalize=['rank'])
- else:
- column = Null
- return column
+ return database.rank_full_text(column, value, normalize=['rank'])
def convert_domain(self, domain, tables, Model):
transaction = Transaction()
@@ -92,4 +89,7 @@
table, _ = tables[None]
column = self.sql_column(table)
column = self._domain_column('ilike', column)
- return [self._rank_column(column, name, Model)]
+ column = self._rank_column(column, name, Model)
+ if column:
+ return [column]
+ return []
