[SQL-CVS] r4547 - in SQLObject/trunk: docs sqlobject

[<sub...@co...>]

Author: phd
Date: Sun Jun 24 06:19:26 2012
New Revision: 4547

Log:
Merged revision 4546 from branch 1.3: fixed a bug in sqlbuilder.Select.filter -
removed comparison with SQLTrueClause.

Modified:
   SQLObject/trunk/docs/News.txt
   SQLObject/trunk/sqlobject/sqlbuilder.py
   SQLObject/trunk/sqlobject/sresults.py

Modified: SQLObject/trunk/docs/News.txt
==============================================================================
--- SQLObject/trunk/docs/News.txt	Sun Jun 24 06:17:40 2012	(r4546)
+++ SQLObject/trunk/docs/News.txt	Sun Jun 24 06:19:26 2012	(r4547)
@@ -10,6 +10,11 @@
 SQLObject (trunk)
 =================
 
+SQLObject 1.3.2
+===============
+
+* A bugfix was ported from `SQLObject 1.2.4`_.
+
 SQLObject 1.3.1
 ===============
 
@@ -32,6 +37,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/trunk/sqlobject/sqlbuilder.py
==============================================================================
--- SQLObject/trunk/sqlobject/sqlbuilder.py	Sun Jun 24 06:17:40 2012	(r4546)
+++ SQLObject/trunk/sqlobject/sqlbuilder.py	Sun Jun 24 06:19:26 2012	(r4547)
@@ -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/trunk/sqlobject/sresults.py
==============================================================================
--- SQLObject/trunk/sqlobject/sresults.py	Sun Jun 24 06:17:40 2012	(r4546)
+++ SQLObject/trunk/sqlobject/sresults.py	Sun Jun 24 06:19:26 2012	(r4547)
@@ -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):