odoo
/
odoo
2
0
Fork 0
Code Pull Requests Releases Activity

[FIX] expression: the <> can be part of leaves (before normalization). 

bzr revid: vmt@openerp.com-20110810092859-mzp9nmo81azxtq8s
This commit is contained in:
Vo Minh Thu 2011-08-10 11:28:59 +02:00
parent 44b3499a73
commit a32476c6d9
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
openerp/osv/expression.py
View File

@ -109,11 +109,11 @@ def is_operator(element):
# TODO change the share wizard to use this function.
def is_leaf(element, internal=False):
INTERNAL_OPS = OPS + ('inselect', '<>')
INTERNAL_OPS = OPS + ('inselect',)
return (isinstance(element, tuple) or isinstance(element, list)) \
and len(element) == 3 \
and (((not internal) and element[1] in OPS) \
or (internal and element[1] in INTERNAL_OPS))
and (((not internal) and element[1] in OPS + ('<>',)) \
or (internal and element[1] in INTERNAL_OPS + ('<>',)))
def normalize_operator(operator):
operator = operator.lower()
@ -515,7 +515,7 @@ class expression(object):
query = '(%s.%s IS NULL or %s.%s = false )' % (table._table, left, table._table, left)
params = []
elif (((right == False) and (type(right)==bool)) or (right is None)) and (operator == '='):
elif (right is False or right is None) and (operator == '='):
query = '%s.%s IS NULL ' % (table._table, left)
params = []
@ -523,7 +523,7 @@ class expression(object):
query = '(%s.%s IS NOT NULL and %s.%s != false)' % (table._table, left, table._table, left)
params = []
elif (((right == False) and (type(right)==bool)) or right is None) and (operator == '!='):
elif (right is False or right is None) and (operator == '!='):
query = '%s.%s IS NOT NULL' % (table._table, left)
params = []