#!/usr/bin/env python
# -*- encoding: utf-8 -*-
+##############################################################################
+#
+# OpenERP, Open Source Management Solution
+# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). All Rights Reserved
+# $Id$
+#
+# This program is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+##############################################################################
from tools import flatten, reverse_enumerate
+import fields
class expression(object):
parse a domain expression
use a real polish notation
leafs are still in a ('foo', '=', 'bar') format
- For more info: http://...
+ For more info: http://christophe-simonis-at-tiny.blogspot.com/2008/08/new-new-domain-notation.html
"""
def _is_operator(self, element):
- return isinstance(element, str) \
- and element in ['&', '|', '!']
+ return isinstance(element, (str, unicode)) and element in ['&', '|', '!']
- def _is_leaf(self, element):
- return isinstance(element, tuple) \
+ def _is_leaf(self, element, internal=False):
+ OPS = ('=', '!=', '<>', '<=', '<', '>', '>=', '=like', 'like', 'not like', 'ilike', 'not ilike', 'in', 'not in', 'child_of')
+ INTERNAL_OPS = OPS + ('inselect',)
+ return (isinstance(element, tuple) or isinstance(element, list)) \
and len(element) == 3 \
- and element[1] in ('=', '!=', '<>', '<=', '<', '>', '>=', '=like', 'like', 'not like', 'ilike', 'not ilike', 'in', 'not in', 'child_of')
+ and (((not internal) and element[1] in OPS) \
+ or (internal and element[1] in INTERNAL_OPS))
def __execute_recursive_in(self, cr, s, f, w, ids):
- #deprecated -> use _left and _right...
res = []
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(['%d']*len(subids))),
+ ' WHERE "%s" in (%s)' % (s, f, w, ','.join(['%s']*len(subids))),
subids)
res.extend([r[0] for r in cr.fetchall()])
return res
if not self.__exp:
return self
- def _rec_get(ids, table, parent):
- if table._parent_store:
+ def _rec_get(ids, table, parent=None, left='id', prefix=''):
+ if table._parent_store and (not table.pool._init):
+# TODO: Improve where joins are implemented for many with '.', replace by:
+# doms += ['&',(prefix+'.parent_left','<',o.parent_right),(prefix+'.parent_left','>=',o.parent_left)]
doms = []
for o in table.browse(cr, uid, ids, context=context):
if doms:
- doms.insert(0,'|')
- doms += ['&',('parent_left','<',o.parent_right),('parent_left','>=',o.parent_left)]
- return table.search(cr, uid, doms, context=context)
+ doms.insert(0, '|')
+ doms += ['&', ('parent_left', '<', o.parent_right), ('parent_left', '>=', o.parent_left)]
+ if prefix:
+ return [(left, 'in', table.search(cr, uid, doms, context=context))]
+ return doms
else:
- if not ids:
- return []
- ids2 = table.search(cr, uid, [(parent, 'in', ids)], context=context)
- return ids + _rec_get(ids2, table, parent)
+ def rg(ids, table, parent):
+ if not ids:
+ return []
+ ids2 = table.search(cr, uid, [(parent, 'in', ids)], context=context)
+ return ids + rg(ids2, table, parent)
+ return [(left, 'in', rg(ids, table, parent or table._parent_name))]
self.__main_table = table
- for i, e in enumerate(self.__exp):
+ i = -1
+ while i + 1<len(self.__exp):
+ i += 1
+ e = self.__exp[i]
if self._is_operator(e) or e == self.__DUMMY_LEAF:
continue
left, operator, right = e
if left in table._inherit_fields:
working_table = table.pool.get(table._inherit_fields[left][0])
if working_table not in self.__tables.values():
- self.__joins.append('%s.%s' % (table._table, table._inherits[working_table._name]))
+ self.__joins.append(('%s.%s=%s.%s' % (working_table._table, 'id', table._table, table._inherits[working_table._name]), working_table._table))
self.__tables[i] = working_table
field = working_table._columns.get(fargs[0], False)
if not field:
if left == 'id' and operator == 'child_of':
- right += _rec_get(right, working_table, working_table._parent_name)
- self.__exp[i] = ('id', 'in', right)
+ dom = _rec_get(right, working_table)
+ self.__exp = self.__exp[:i] + dom + self.__exp[i+1:]
continue
field_obj = table.pool.get(field._obj)
self.__exp[i] = self.__DUMMY_LEAF
else:
subexp = field.search(cr, uid, table, left, [self.__exp[i]])
- # we assume that the expression is valid
+ # we assume that the expression is valid
# we create a dummy leaf for forcing the parsing of the resulting expression
self.__exp[i] = '&'
self.__exp.insert(i + 1, self.__DUMMY_LEAF)
for j, se in enumerate(subexp):
self.__exp.insert(i + 2 + j, se)
-
+
# else, the value of the field is store in the database, so we search on it
elif field._type == 'one2many':
if isinstance(right, basestring):
- ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator)]
+ ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator, limit=None)]
else:
ids2 = list(right)
if not ids2:
#FIXME
if operator == 'child_of':
if isinstance(right, basestring):
- ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], 'like')]
+ ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], 'like', limit=None)]
else:
ids2 = list(right)
return ids
return self.__execute_recursive_in(cr, field._id1, field._rel, field._id2, ids)
- self.__exp[i] = ('id', 'in', _rec_convert(ids2 + _rec_get(ids2, field_obj, working_table._parent_name)))
+ dom = _rec_get(ids2, field_obj)
+ ids2 = field_obj.search(cr, uid, dom, context=context)
+ self.__exp[i] = ('id', 'in', _rec_convert(ids2))
else:
if isinstance(right, basestring):
res_ids = [x[0] for x in field_obj.name_search(cr, uid, right, [], operator)]
elif field._type == 'many2one':
if operator == 'child_of':
if isinstance(right, basestring):
- ids2 = [x[0] for x in field_obj.search_name(cr, uid, right, [], 'like')]
+ ids2 = [x[0] for x in field_obj.name_search(cr, uid, right, [], 'like', limit=None)]
else:
ids2 = list(right)
self.__operator = 'in'
if field._obj != working_table._name:
- right = ids2 + _rec_get(ids2, field_obj, working_table._parent_name)
+ dom = _rec_get(ids2, field_obj, left=left, prefix=field._obj)
else:
- right = ids2 + _rec_get(ids2, working_table, left)
- left = 'id'
- self.__exp[i] = (left, 'in', right)
+ dom = _rec_get(ids2, working_table, parent=left)
+ self.__exp = self.__exp[:i] + dom + self.__exp[i+1:]
else:
- if isinstance(right, basestring):
- res_ids = field_obj.name_search(cr, uid, right, [], operator)
+ if isinstance(right, basestring): # and not isinstance(field, fields.related):
+ c = context.copy()
+ c['active_test'] = False
+ res_ids = field_obj.name_search(cr, uid, right, [], operator, limit=None, context=c)
right = map(lambda x: x[0], res_ids)
self.__exp[i] = (left, 'in', right)
else:
return self
def __leaf_to_sql(self, leaf, table):
+ if leaf == self.__DUMMY_LEAF:
+ return ('(1=1)', [])
left, operator, right = leaf
if operator == 'inselect':
if len_after:
if left == 'id':
- instr = ','.join(['%d'] * len_after)
+ 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)
query = '(%s OR %s IS NULL)' % (query, left)
else:
params = []
- if right is False and operator == '=':
- query = '%s IS NULL' % left
- elif right is False and operator in ['<>', '!=']:
- query = '%s IS NOT NULL' % left
+ if (((right == False) and (type(right)==bool)) or (right is None)) and (operator == '='):
+ query = '%s.%s IS NULL' % (table._table, left)
+ elif (((right == False) and (type(right)==bool)) or right is None) and (operator in ['<>', '!=']):
+ query = '%s.%s IS NOT NULL' % (table._table, left)
else:
if left == 'id':
query = '%s.id %s %%s' % (table._table, operator)
stack = []
params = []
for i, e in reverse_enumerate(self.__exp):
- if self._is_leaf(e):
- table = self.__tables.has_key(i) and self.__tables[i] or self.__main_table
+ if self._is_leaf(e, internal=True):
+ table = self.__tables.get(i, self.__main_table)
q, p = self.__leaf_to_sql(e, table)
params.insert(0, p)
stack.append(q)
q1 = stack.pop()
q2 = stack.pop()
stack.append('(%s %s %s)' % (q1, ops[e], q2,))
-
+
query = ' AND '.join(reversed(stack))
- joins = ' AND '.join(map(lambda j: '%s.id = %s' % (self.__main_table._table, j), self.__joins))
+ joins = ' AND '.join(map(lambda j: j[0], self.__joins))
if joins:
- query = '(%s AND (%s))' % (joins, query)
+ query = '(%s) AND (%s)' % (joins, query)
return (query, flatten(params))
def get_tables(self):
- return ['"%s"' % t._table for t in set(self.__tables.values())]
+ return ['"%s"' % t._table for t in set(self.__tables.values()+[self.__main_table])]
# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
projects / odoo / odoo.git / blobdiff