engine argument on tables optional

test suite uses BaseProxyEngine as a base for the tester engine
documented global proxy engine

2 files changed, 12 insertions, 7 deletions

diff --git a/test/testbase.py b/test/testbase.py
index 2a9094f5d..bddb940be 100644
--- a/test/testbase.py
+++ b/test/testbase.py
@@ -1,7 +1,8 @@
 import unittest
 import StringIO
 import sqlalchemy.engine as engine
-import sqlalchemy.ext.proxy
+import sqlalchemy.ext.proxy as proxy
+import sqlalchemy.schema as schema
 import re, sys
 
 echo = True
@@ -47,7 +48,7 @@ def parse_argv():
         raise "Could not create engine.  specify --db <sqlite|sqlite_file|postgres|mysql|oracle> to test runner."
 
     if PROXY:
-        db = sqlalchemy.ext.proxy.ProxyEngine(echo=echo, default_ordering=True)
+        db = proxy.ProxyEngine(echo=echo, default_ordering=True)
         db.connect(db_uri)
     else:
         db = engine.create_engine(db_uri, echo=echo, default_ordering=True)
@@ -103,17 +104,21 @@ class AssertMixin(PersistTest):
         finally:
             self.assert_(db.sql_count == count, "desired statement count %d does not match %d" % (count, db.sql_count))
 
-class EngineAssert(object):
+class EngineAssert(proxy.BaseProxyEngine):
     """decorates a SQLEngine object to match the incoming queries against a set of assertions."""
     def __init__(self, engine):
-        self.engine = engine
+        self._engine = engine
         self.realexec = engine.post_exec
         self.realexec.im_self.post_exec = self.post_exec
         self.logger = engine.logger
         self.set_assert_list(None, None)
         self.sql_count = 0
-    def __getattr__(self, key):
-        return getattr(self.engine, key)
+    def get_engine(self):
+        return self._engine
+    def set_engine(self, e):
+        self._engine = e
+#    def __getattr__(self, key):
+ #       return getattr(self.engine, key)
     def set_assert_list(self, unittest, list):
         self.unittest = unittest
         self.assert_list = list
diff --git a/test/testtypes.py b/test/testtypes.py
index 3f25d696f..4bee6a394 100644
--- a/test/testtypes.py
+++ b/test/testtypes.py
@@ -67,7 +67,7 @@ class ColumnsTest(AssertMixin):
                                    'float_column': 'float_column NUMERIC(25, 2)'
                                  }
 
-        if not db.engine.__module__.endswith('sqlite'):
+        if not db.name=='sqlite':
             expectedResults['float_column'] = 'float_column FLOAT(25)'
     
         print db.engine.__module__