tryton-do/tryton
2
0
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Improve search on char translated to handle all operators

Browse Source
This commit is contained in:
Cédric Krier
2008-11-05 18:14:29 +01:00
parent bb52cf1b95
commit 03b3d0c394
1 changed files with 28 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
trytond/osv/orm.py
+28 -26
View File
@@ -2607,33 +2607,35 @@ class ORM(object):
i += 1
else:
if field.translate:
exprs = ['%s', '%s']
if args[i][1] in ('like', 'ilike', 'not like', 'not ilike'):
oper = 'OR'
if args[i][1] in ('not like', 'not ilike'):
oper = 'AND'
query1 = '(SELECT res_id FROM ir_translation ' \
'WHERE name = %s AND lang = %s ' \
'AND type = %s ' \
'AND (value ' + args[i][1] + ' %s ' \
+ oper +' value ' + args[i][1] + ' %s))'
query2 = [table._name + ',' + args[i][0],
context.get('language', False) or 'en_US',
'model', '%% %s%%' % args[i][2],
'%s%%' % args[i][2]]
query1 += ' UNION '
table_query = ''
table_args = []
if table.table_query(context):
table_query, table_args = table.table_query(context)
table_query = '(' + table_query + ') AS '
query1 += '(SELECT id FROM ' + table_query + \
'"' + table._table + '" ' \
'WHERE ("' + args[i][0] + '" ' + \
args[i][1] + ' %s ' + oper + ' "' + args[i][0] + '" ' + \
args[i][1] + ' %s))'
query2 += table_args + ['%% %s%%' % args[i][2],
'%s%%' % args[i][2]]
args[i] = ('id', 'inselect', (query1, query2), table)
exprs = ['%% %s%%', '%s%%']
oper = 'OR'
if args[i][1] in ('not like', 'not ilike', '!='):
oper = 'AND'
query1 = '(SELECT res_id FROM ir_translation ' \
'WHERE name = %s AND lang = %s ' \
'AND type = %s ' \
'AND (value ' + args[i][1] + ' %s ' \
+ oper +' value ' + args[i][1] + ' %s))'
query2 = [table._name + ',' + args[i][0],
context.get('language', False) or 'en_US',
'model', exprs[0] % args[i][2],
exprs[1] % args[i][2]]
query1 += ' UNION '
table_query = ''
table_args = []
if table.table_query(context):
table_query, table_args = table.table_query(context)
table_query = '(' + table_query + ') AS '
query1 += '(SELECT id FROM ' + table_query + \
'"' + table._table + '" ' \
'WHERE ("' + args[i][0] + '" ' + \
args[i][1] + ' %s ' + oper + ' "' + args[i][0] + '" ' + \
args[i][1] + ' %s))'
query2 += table_args + [exprs[0] % args[i][2],
exprs[1] % args[i][2]]
args[i] = ('id', 'inselect', (query1, query2), table)
else:
args[i] += (table,)
i += 1