Author: phd
Date: Sun Jun 24 06:17:40 2012
New Revision: 4546
Log:
Merged revision 4545 from branch 1.2: fixed a bug in sqlbuilder.Select.filter -
removed comparison with SQLTrueClause.
Modified:
SQLObject/branches/1.3/docs/News.txt
SQLObject/branches/1.3/sqlobject/sqlbuilder.py
SQLObject/branches/1.3/sqlobject/sresults.py
Modified: SQLObject/branches/1.3/docs/News.txt
==============================================================================
--- SQLObject/branches/1.3/docs/News.txt Sun Jun 24 06:14:24 2012 (r4545)
+++ SQLObject/branches/1.3/docs/News.txt Sun Jun 24 06:17:40 2012 (r4546)
@@ -7,6 +7,11 @@
.. _start:
+SQLObject 1.3.2
+===============
+
+* A bugfix was ported from `SQLObject 1.2.4`_.
+
SQLObject 1.3.1
===============
@@ -29,6 +34,12 @@
rewritten and extended; ``charset`` was renamed to ``dbEncoding``;
a longstanding bug was fixed - pass port to connect().
+SQLObject 1.2.4
+===============
+
+* Fixed a bug in sqlbuilder.Select.filter - removed comparison with
+ SQLTrueClause.
+
SQLObject 1.2.3
===============
Modified: SQLObject/branches/1.3/sqlobject/sqlbuilder.py
==============================================================================
--- SQLObject/branches/1.3/sqlobject/sqlbuilder.py Sun Jun 24 06:14:24 2012 (r4545)
+++ SQLObject/branches/1.3/sqlobject/sqlbuilder.py Sun Jun 24 06:17:40 2012 (r4546)
@@ -618,12 +618,7 @@
clause = self.ops['clause']
if isinstance(clause, basestring):
clause = SQLConstant('(%s)' % clause)
-
- if clause == SQLTrueClause:
- newClause = filter_clause
- else:
- newClause = AND(clause, filter_clause)
- return self.newClause(newClause)
+ return self.newClause(AND(clause, filter_clause))
def __sqlrepr__(self, db):
Modified: SQLObject/branches/1.3/sqlobject/sresults.py
==============================================================================
--- SQLObject/branches/1.3/sqlobject/sresults.py Sun Jun 24 06:14:24 2012 (r4545)
+++ SQLObject/branches/1.3/sqlobject/sresults.py Sun Jun 24 06:17:40 2012 (r4546)
@@ -122,7 +122,7 @@
return self
clause = self.clause
if isinstance(clause, basestring):
- clause = sqlbuilder.SQLConstant('(%s)' % self.clause)
+ clause = sqlbuilder.SQLConstant('(%s)' % clause)
return self.newClause(sqlbuilder.AND(clause, filter_clause))
def __getitem__(self, value):
|
