[SQL-CVS] r784 - in trunk/SQLObject/sqlobject: . tests

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

Author: ianb
Date: 2005-05-10 17:31:29 +0000 (Tue, 10 May 2005)
New Revision: 784

Modified:
   trunk/SQLObject/sqlobject/conftest.py
   trunk/SQLObject/sqlobject/tests/dbtest.py
Log:
Added option to show query output

Modified: trunk/SQLObject/sqlobject/conftest.py
===================================================================
--- trunk/SQLObject/sqlobject/conftest.py	2005-05-10 17:25:13 UTC (rev 783)
+++ trunk/SQLObject/sqlobject/conftest.py	2005-05-10 17:31:29 UTC (rev 784)
@@ -33,7 +33,11 @@
     Option('-S', '--SQL',
            action="store_true", dest="show_sql", default=False,
            help="Show SQL from statements (when capturing stdout the "
-           "SQL is only displayed when a test fails)"))
+           "SQL is only displayed when a test fails)"),
+    Option('-O', '--SQL-output',
+           action="store_true", dest="show_sql_output", default=False,
+           help="Show output from SQL statements (when capturing "
+           "stdout the output is only displayed when a test fails)"))
 
 class SQLObjectClass(py.test.collect.Class):
     def run(self):

Modified: trunk/SQLObject/sqlobject/tests/dbtest.py
===================================================================
--- trunk/SQLObject/sqlobject/tests/dbtest.py	2005-05-10 17:25:13 UTC (rev 783)
+++ trunk/SQLObject/sqlobject/tests/dbtest.py	2005-05-10 17:31:29 UTC (rev 784)
@@ -83,6 +83,8 @@
     conn = sqlobject.connectionForURI(name, **kw)
     if conftest.option.show_sql:
         conn.debug = True
+    if conftest.option.show_sql_output:
+        conn.debugOutput = True
     return conn
 
 connection = getConnection()