diff options
Diffstat (limited to 'lib/sqlalchemy/sql.py')
-rw-r--r-- | lib/sqlalchemy/sql.py | 6 |
1 files changed, 3 insertions, 3 deletions
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))) |