From: Mike Bayer Date: Thu, 11 Sep 2008 20:48:39 +0000 (+0000) Subject: - 0.5.0rc1 X-Git-Tag: rel_0_5rc1 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=01de7110984604e731d19a751a829d21f62106f8;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git - 0.5.0rc1 - removed unneeded grouping from BooleanClauseList, generated needless parens --- diff --git a/CHANGES b/CHANGES index ac04eec75d..ee667c3cf9 100644 --- a/CHANGES +++ b/CHANGES @@ -4,7 +4,7 @@ CHANGES ======= -0.5beta4 +0.5.0rc1 ======== - orm diff --git a/VERSION b/VERSION index b9eb5bd6e8..3dc6a34dce 100644 --- 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 57770ef42e..dfc6bd8fae 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 cff8a9d331..facfb52870 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(