- 0.5.0rc1

- removed unneeded grouping from BooleanClauseList, generated needless parens

diff --git a/CHANGES b/CHANGES
index ac04eec75d62c57911a86d024abed7bbb5af0515..ee667c3cf994ca63ca756c77d10122e8cc4ada2e 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -4,7 +4,7 @@
 CHANGES
 =======
 
-0.5beta4
+0.5.0rc1
 ========
 
 - orm

diff --git a/VERSION b/VERSION
index b9eb5bd6e8bacbc4fcfabe2660f31efe3dbb563a..3dc6a34dcec376a2bafe8527aa01681a01330d9d 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.5.0beta4
+0.5.0rc1

diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py
index 57770ef42ebb822e3ceb035bb16f5ca8117adc85..dfc6bd8fae3ab39364a847ff7e2bc4192c309951 100644 (file)
--- a/lib/sqlalchemy/sql/expression.py
+++ b/lib/sqlalchemy/sql/expression.py
@@ -2060,9 +2060,7 @@ class BooleanClauseList(ClauseList, ColumnElement):
         super(BooleanClauseList, self).__init__(*clauses, **kwargs)
         self.type = sqltypes.to_instance(kwargs.get('type_', sqltypes.Boolean))
 
-    def self_group(self, against=None):
-        return _Grouping(self)
-    
+
 class _CalculatedClause(ColumnElement):
     """Describe a calculated SQL expression that has a type, like ``CASE``.
 

diff --git a/test/sql/select.py b/test/sql/select.py
index cff8a9d3313fd604c64aa9ae48a993c233271802..facfb52870e973e536e26df1076759309c66ac53 100644 (file)
--- a/test/sql/select.py
+++ b/test/sql/select.py
@@ -196,8 +196,8 @@ sq.myothertable_othername AS sq_myothertable_othername FROM (" + sqstring + ") A
                     exists().where(table2.c.otherid=='bar')
                 )
             ]),
-            "SELECT ((EXISTS (SELECT * FROM myothertable WHERE myothertable.otherid = :otherid_1)) "\
-            "OR (EXISTS (SELECT * FROM myothertable WHERE myothertable.otherid = :otherid_2))) AS anon_1"
+            "SELECT (EXISTS (SELECT * FROM myothertable WHERE myothertable.otherid = :otherid_1)) "\
+            "OR (EXISTS (SELECT * FROM myothertable WHERE myothertable.otherid = :otherid_2)) AS anon_1"
         )
         
 
@@ -348,7 +348,7 @@ sq.myothertable_othername AS sq_myothertable_othername FROM (" + sqstring + ") A
         assert str(x) == 'a AND b AND c'
         self.assert_compile(
             select([x.label('foo')]),
-            'SELECT (a AND b AND c) AS foo'
+            'SELECT a AND b AND c AS foo'
         )
         
         self.assert_compile(