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

[FIX] search: when count=True, execute main query as a subquery to avoid side effects with offset and limit 

bzr revid: rco@openerp.com-20130218145100-4q24j8ko9j9elwpw
This commit is contained in:
Raphael Collet 2013-02-18 15:51:00 +01:00
parent 4d242424cd
commit 0f43032b82
1 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
openerp/osv/orm.py
View File

@ -4870,12 +4870,16 @@ class BaseModel(object):
limit_str = limit and ' limit %d' % limit or ''
offset_str = offset and ' offset %d' % offset or ''
where_str = where_clause and (" WHERE %s" % where_clause) or ''
query_str = 'SELECT "%s".id FROM ' % self._table + from_clause + where_str + order_by + limit_str + offset_str
if count:
cr.execute('SELECT count("%s".id) FROM ' % self._table + from_clause + where_str + limit_str + offset_str, where_clause_params)
res = cr.fetchall()
return res[0][0]
cr.execute('SELECT "%s".id FROM ' % self._table + from_clause + where_str + order_by + limit_str + offset_str, where_clause_params)
# /!\ the main query must be executed as a subquery, otherwise
# offset and limit apply to the result of count()!
cr.execute('SELECT count(*) FROM (%s) AS res' % query_str, where_clause_params)
res = cr.fetchone()
return res[0]
cr.execute(query_str, where_clause_params)
res = cr.fetchall()
# TDE note: with auto_join, we could have several lines about the same result