diff options
| -rw-r--r-- | CHANGES | 2 | ||||
| -rw-r--r-- | VERSION | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 4 | ||||
| -rw-r--r-- | test/sql/select.py | 6 |
4 files changed, 6 insertions, 8 deletions
@@ -4,7 +4,7 @@ CHANGES ======= -0.5beta4 +0.5.0rc1 ======== - orm @@ -1 +1 @@ -0.5.0beta4 +0.5.0rc1 diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 57770ef42..dfc6bd8fa 100644 --- 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 cff8a9d33..facfb5287 100644 --- 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( |