echo can now be False, True or 'debug'. result sets are printed only if echo is ...

diff --git a/lib/sqlalchemy/engine.py b/lib/sqlalchemy/engine.py
index d39ec1e83edafa69c185412a2fa3f33176c78b07..cad60b969779ebc1870080d569a63fc654c73ba2 100644 (file)
--- a/lib/sqlalchemy/engine.py
+++ b/lib/sqlalchemy/engine.py
@@ -288,7 +288,7 @@ class SQLEngine(schema.SchemaEngine):
         try:
             self.pre_exec(connection, c, statement, parameters, echo = echo, **kwargs)
 
-            if echo is True or self.echo:
+            if echo is True or self.echo is not False:
                 self.log(statement)
                 self.log(repr(parameters))
             if isinstance(parameters, list) and len(parameters) > 0 and (isinstance(parameters[0], list) or isinstance(parameters[0], dict)):
@@ -336,7 +336,7 @@ class ResultProxy:
     
     def __init__(self, cursor, engine, typemap = None):
         self.cursor = cursor
-        self.echo = engine.echo
+        self.echo = engine.echo=="debug"
         self.rowcount = engine.context.rowcount
         metadata = cursor.description
         self.props = {}

diff --git a/test/mapper.py b/test/mapper.py
index 1fad7b1a7fc8b61e84295dec570ba602b70ab2b8..3029e4c89843ba7c13bd20c9d4848c3e0b151ff2 100644 (file)
--- a/test/mapper.py
+++ b/test/mapper.py
@@ -94,8 +94,8 @@ class MapperTest(MapperSuperTest):
     def testorderby(self):
         # TODO: make a unit test out of these various combinations
 #        m = mapper(User, users, order_by=desc(users.c.user_name))
-#        m = mapper(User, users, order_by=None)
-        m = mapper(User, users)
+        m = mapper(User, users, order_by=None)
+#        m = mapper(User, users)
         
 #        l = m.select(order_by=[desc(users.c.user_name), asc(users.c.user_id)])
         l = m.select()

diff --git a/test/testbase.py b/test/testbase.py
index 875e0d0b2bcd3ff5bdd3611a1f55ebb37e327dc4..49bc6bfb5eaa6ac6ffff9ca55aebeadfa3294079 100644 (file)
--- a/test/testbase.py
+++ b/test/testbase.py
@@ -7,6 +7,7 @@ import sqlalchemy.databases.postgres as postgres
 #import sqlalchemy.databases.mysql as mysql
 
 echo = True
+#echo = 'debug'
 db = None