merge r6703 of trunk fixes [ticket:1661]

diff --git a/CHANGES b/CHANGES
index 98063d9c1b8e36d096338b96ed608738f5ac8144..55ac86349beb7cf30dcd94090e3ba87d0ab96e5c 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -3,7 +3,12 @@
 =======
 CHANGES
 =======
-
+0.5.9
+=====
+- sql
+    - Fixed erroneous self_group() call in expression package.
+      [ticket:1661]
+      
 0.5.9
 =====
 - firebird

diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index c9ef37c8b7f8cdd48897f567bb0204dac33c0fb4..5a47c4e1eb43450322b410a929ca05ffab031b69 100644 (file)
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -2382,7 +2382,7 @@ class _UnaryExpression(ColumnElement):
         else:
             return super(_UnaryExpression, self)._negate()
 
-    def self_group(self, against):
+    def self_group(self, against=None):
         if self.operator and operators.is_precedent(self.operator, against):
             return _Grouping(self)
         else: