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

[FIX] fixes a read_group test to use the correct field:interval key when grouping with an interval, and makes sure the sql request properly quote the order statement (without quoting DESC or ASC) (orm.py) 

bzr revid: ged@openerp.com-20140404091947-z87yg2bc7htovj4q
This commit is contained in:
Gery Debongnie 2014-04-04 11:19:47 +02:00
parent a108599e28
commit f48ab8373b
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
openerp/addons/base/tests/test_orm.py
View File

@ -134,7 +134,7 @@ class TestORM(common.TransactionCase):
rg = self.partner.read_group(self.cr, self.uid, domain, ['date'], 'date' + ':' + interval)
result = {}
for r in rg:
result[r['date']] = set(self.partner.search(self.cr, self.uid, r['__domain']))
result[r['date:' + interval]] = set(self.partner.search(self.cr, self.uid, r['__domain']))
return result
self.assertEqual(len(read_group('day')), len(partners_by_day))

3
openerp/osv/orm.py
View File

@ -2223,7 +2223,8 @@ class BaseModel(object):
orderby_terms.append(order_clause)
groupby_terms += [order_term.split()[0] for order_term in order_clause.split(',')]
else:
orderby_terms.append('"%s"' % order_part)
order = '"%s" %s' % (order_field, '' if len(order_split) == 1 else order_split[1])
orderby_terms.append(order)
elif order_field in aggregated_fields:
orderby_terms.append(order_part)
else: