From 82104a5d0dd3a1b428298dde98354821115c7c0f Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 3 Apr 2006 17:49:41 +0000 Subject: [PATCH] further order_by: order_by() with no arguments should not affect the current order_by clause (same with group_by) --- lib/sqlalchemy/sql.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/sqlalchemy/sql.py b/lib/sqlalchemy/sql.py index 39888fe2ad..816fac3781 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 len(clauses) == 0 or clauses[0] is None: + if len(clauses) == 1 and clauses[0] is None: self.order_by_clause = ClauseList() elif getattr(self, 'order_by_clause', None): 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 len(clauses) == 0 or clauses[0] is None: + if len(clauses) == 1 and 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))) -- 2.47.2