- Repaired `__str__()` method on Query. [ticket:1066]

diff --git a/CHANGES b/CHANGES
index fc32ab2d0e8b4f8e7d313453f0ff9c9fd4da45c9..1327c636da6512e1dbac6be438d6d49a1cc806af 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -23,7 +23,9 @@ CHANGES
     - Fixed explicit, self-referential joins between two 
       joined-table inheritance mappers when using 
       query.join(cls, aliased=True).  [ticket:1082]
-      
+
+    - Repaired `__str__()` method on Query. [ticket:1066]
+    
 0.5beta1
 ========
     - An ongoing document describing the changes from 0.4 to 0.5

diff --git a/lib/sqlalchemy/orm/query.py b/lib/sqlalchemy/orm/query.py
index 37463ef10df60526714ee72ef27f26cd4ef1eade..a2a546caa04018d8a754669d8def3471bbac6b28 100644 (file)
--- a/lib/sqlalchemy/orm/query.py
+++ b/lib/sqlalchemy/orm/query.py
@@ -1445,7 +1445,7 @@ class Query(object):
         self.logger.debug(msg)
 
     def __str__(self):
-        return str(self.compile())
+        return str(self._compile_context().statement)
 
 
 class _QueryEntity(object):

diff --git a/test/orm/query.py b/test/orm/query.py
index 4cef98a5c2eb64405ea4e0ac1bd3f745ef5752f0..fcefc4bd7fa5de8b0b76eb3908f3474ca04b4cdc 100644 (file)
--- a/test/orm/query.py
+++ b/test/orm/query.py
@@ -169,6 +169,14 @@ class GetTest(QueryTest):
         assert u.addresses[0].email_address == 'jack@bean.com'
         assert u.orders[1].items[2].description == 'item 5'
 
+    def test_query_str(self):
+        s = create_session()
+        q = s.query(User).filter(User.id==1)
+        self.assertEquals(
+            str(q).replace('\n',''), 
+            'SELECT users.id AS users_id, users.name AS users_name FROM users WHERE users.id = ?'
+            )
+
 class InvalidGenerationsTest(QueryTest):
     def test_no_limit_offset(self):
         s = create_session()