From 3cd30fdc70385fd771b3e305d1440a31da63d962 Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Mon, 12 Dec 2005 01:56:42 +0000 Subject: [PATCH] echo can now be False, True or 'debug'. result sets are printed only if echo is 'debug'. --- lib/sqlalchemy/engine.py | 4 ++-- test/mapper.py | 4 ++-- test/testbase.py | 1 + 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/lib/sqlalchemy/engine.py b/lib/sqlalchemy/engine.py index d39ec1e83e..cad60b9697 100644 --- 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 1fad7b1a7f..3029e4c898 100644 --- 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 875e0d0b2b..49bc6bfb5e 100644 --- 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 -- 2.47.2