[FIX] fixes a read_group test to use the correct field:interval key when grouping...

bzr revid: ged@openerp.com-20140404091947-z87yg2bc7htovj4q

diff --git a/openerp/addons/base/tests/test_orm.py b/openerp/addons/base/tests/test_orm.py
index fcd8196..9683874 100644 (file)
--- a/openerp/addons/base/tests/test_orm.py
+++ b/openerp/addons/base/tests/test_orm.py
@@ -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))

diff --git a/openerp/osv/orm.py b/openerp/osv/orm.py
index 1c72001..d886259 100644 (file)
--- a/openerp/osv/orm.py
+++ b/openerp/osv/orm.py
@@ -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: