def __execute_recursive_in(self, cr, s, f, w, ids, op, type):
res = []
- if not ids:
- return []
- if op not in ('<','>','=','>=','<=','not in'):
- op = 'in'
- for i in range(0, len(ids), cr.IN_MAX):
- subids = ids[i:i+cr.IN_MAX]
- cr.execute('SELECT "%s"' \
- ' FROM "%s"' \
- ' WHERE "%s" %s (%s)' % (s, f, w, op, ','.join(['%s']*len(subids))),
- subids)
- res += [r[0] for r in cr.fetchall() if r[0]]
- return res + (res and self.__execute_recursive_in(cr, s, f, w, res, op, type) or [])
+ if ids:
+ if op in ['<','>','>=','<=']:
+ cr.execute('SELECT "%s"' \
+ ' FROM "%s"' \
+ ' WHERE "%s" %s %s' % (s, f, w, op, ids[0]))
+ res.extend([r[0] for r in cr.fetchall()])
+ else:
+ for i in range(0, len(ids), cr.IN_MAX):
+ subids = ids[i:i+cr.IN_MAX]
+ cr.execute('SELECT "%s"' \
+ ' FROM "%s"' \
+ ' WHERE "%s" in (%s)' % (s, f, w, ','.join(['%s']*len(subids))),
+ subids)
+ res.extend([r[0] for r in cr.fetchall()])
+ else:
+ cr.execute('SELECT distinct("%s")' \
+ ' FROM "%s" where "%s" is not null' % (s, f, s)),
+ res.extend([r[0] for r in cr.fetchall()])
+ return res
def __init__(self, exp):
# check if the expression is valid
if field._type == 'many2one':
right = field_obj.search(cr, uid, [(fargs[1], operator, right)], context=context)
self.__exp[i] = (fargs[0], 'in', right)
+ # Making search easier when there is a left operand as field.o2m or field.m2m
+ if field._type in ['many2many','one2many']:
+ right = field_obj.search(cr, uid, [(fargs[1], operator, right)], context=context)
+ right1 = table.search(cr, uid, [(fargs[0],'in', right)], context=context)
+ self.__exp[i] = ('id', 'in', right1)
+
continue
if field._properties:
# values in the database, so we must ignore it : we generate a dummy leaf
self.__exp[i] = self.__DUMMY_LEAF
else:
- subexp = field.search(cr, uid, table, left, [self.__exp[i]])
+ subexp = field.search(cr, uid, table, left, [self.__exp[i]], context=context)
# we assume that the expression is valid
# we create a dummy leaf for forcing the parsing of the resulting expression
self.__exp[i] = '&'
elif field._type == 'one2many':
- call_null = True
-
- if right:
+ # Applying recursivity on field(one2many)
+ if operator == 'child_of':
if isinstance(right, basestring):
- ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator, limit=None)]
- operator = 'in'
+ ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], 'like', context=context, limit=None)]
else:
- if not isinstance(right,list):
- ids2 = [right]
- else:
- ids2 = right
- if not ids2:
- call_null = True
- operator = 'in' # operator changed because ids are directly related to main object
+ ids2 = list(right)
+ if field._obj != working_table._name:
+ dom = _rec_get(ids2, field_obj, left=left, prefix=field._obj)
else:
- call_null = False
- o2m_op = 'in'
- if operator in ['not like','not ilike','not in','<>','!=']:
- o2m_op = 'not in'
- self.__exp[i] = ('id', o2m_op, self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', ids2, operator, field._type))
+ dom = _rec_get(ids2, working_table, parent=left)
+ self.__exp = self.__exp[:i] + dom + self.__exp[i+1:]
- if call_null:
- o2m_op = 'not in'
- if operator in ['not like','not ilike','not in','<>','!=']:
- o2m_op = 'in'
- self.__exp[i] = ('id', o2m_op, self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', [], operator, field._type) or [0])
+ else:
+ call_null = True
+
+ if right:
+ if isinstance(right, basestring):
+ ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator, context=context, limit=None)]
+ operator = 'in'
+ else:
+ if not isinstance(right,list):
+ ids2 = [right]
+ else:
+ ids2 = right
+ if not ids2:
+ call_null = True
+ operator = 'in' # operator changed because ids are directly related to main object
+ else:
+ call_null = False
+ o2m_op = 'in'
+ if operator in ['not like','not ilike','not in','<>','!=']:
+ o2m_op = 'not in'
+ self.__exp[i] = ('id', o2m_op, self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', ids2, operator, field._type))
+
+ if call_null:
+ o2m_op = 'not in'
+ if operator in ['not like','not ilike','not in','<>','!=']:
+ o2m_op = 'in'
+ self.__exp[i] = ('id', o2m_op, self.__execute_recursive_in(cr, field._fields_id, field_obj._table, 'id', [], operator, field._type) or [0])
elif field._type == 'many2many':
#FIXME
if operator == 'child_of':
if isinstance(right, basestring):
- ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], 'like', limit=None)]
+ ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], 'like', context=context, limit=None)]
else:
ids2 = list(right)
call_null_m2m = True
if right:
if isinstance(right, basestring):
- res_ids = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator)]
+ res_ids = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator, context=context)]
operator = 'in'
else:
if not isinstance(right, list):
query = '(%s.%s in (%s))' % (table._table, left, right[0])
params = right[1]
elif operator in ['in', 'not in']:
- params = right[:]
+ params = right and right[:] or []
len_before = len(params)
for i in range(len_before)[::-1]:
if params[i] == False:
len_after = len(params)
check_nulls = len_after != len_before
query = '(1=0)'
-
+
if len_after:
if left == 'id':
instr = ','.join(['%s'] * len_after)
else:
instr = ','.join([table._columns[left]._symbol_set[0]] * len_after)
query = '(%s.%s %s (%s))' % (table._table, left, operator, instr)
-
+ else:
+ # the case for [field, 'in', []] or [left, 'not in', []]
+ if operator == 'in':
+ query = '(%s.%s IS NULL)' % (table._table, left)
+ else:
+ query = '(%s.%s IS NOT NULL)' % (table._table, left)
if check_nulls:
query = '(%s OR %s.%s IS NULL)' % (query, table._table, left)
else:
projects / odoo / odoo.git / blobdiff