From 7e7407a03ec0b9ce888e3cc4db92fb2ba868a47b Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 3 Apr 2006 17:46:08 +0000 Subject: ack, fixes to the order by stuff from last night --- lib/sqlalchemy/sql.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'lib/sqlalchemy/sql.py') diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py index 34f59fd9c..39888fe2a 100644 --- a/lib/sqlalchemy/sql.py +++ b/lib/sqlalchemy/sql.py @@ -1145,14 +1145,14 @@ class TableClause(FromClause): class SelectBaseMixin(object): """base class for Select and CompoundSelects""" def order_by(self, *clauses): - if clauses[0] is None: + if len(clauses) == 0 or clauses[0] is None: self.order_by_clause = ClauseList() elif getattr(self, 'order_by_clause', None): - self.order_by_clause = ClauseList(*(list(clauses)+list(self.order_by_clause.clauses))) + self.order_by_clause = ClauseList(*(list(self.order_by_clause.clauses) + list(clauses))) else: self.order_by_clause = ClauseList(*clauses) def group_by(self, *clauses): - if clauses[0] is None: + if len(clauses) == 0 or clauses[0] is None: self.group_by_clause = ClauseList() elif getattr(self, 'group_by_clause', None): self.group_by_clause = ClauseList(*(list(clauses)+list(self.group_by_clause.clauses))) -- cgit v1.2.1