fix to engine echo, random rundocs

diff --git a/test/rundocs.py b/test/rundocs.py
index 66a4b9a60bc3a2eccde2c8c9e3dd3642df537b84..3ed7d815ee4028b22d0ab9d33eee167ff25c6fa8 100644 (file)
--- a/test/rundocs.py
+++ b/test/rundocs.py
@@ -1,7 +1,7 @@
-from sqlalchemy.schema import *
-from sqlalchemy.mapper import *
-import sqlalchemy.databases.sqlite as sqlite
-engine = sqlite.engine(':memory:', {})
+from sqlalchemy import *
+import sys
+
+engine = create_engine('sqlite://')
 
 engine.echo = True
 
@@ -19,10 +19,11 @@ users.insert().execute(
 
 # class definition
 class User(object):
-    mapper = assignmapper(users)
+    pass
+assign_mapper(User, users)
   
 # select
-user = User.mapper.select(User.c.user_name == 'fred')[0]      
+user = User.get_by(user_name = 'fred')
 
 # modify
 user.user_name = 'fred jones'
@@ -32,6 +33,8 @@ objectstore.commit()
 
 objectstore.clear()
 
+
+
 addresses = Table('email_addresses', engine,
     Column('address_id', Integer, primary_key = True),
     Column('user_id', Integer, ForeignKey(users.c.user_id)),

diff --git a/test/testbase.py b/test/testbase.py
index df4c186c3c2fa5478d616f7779ff7dc739b13cf7..1d9586b53581e0edd5cee7737c4c61eb36ca39cd 100644 (file)
--- a/test/testbase.py
+++ b/test/testbase.py
@@ -83,7 +83,6 @@ class EngineAssert(object):
         self.engine = engine
         self.realexec = engine.execute_compiled
         engine.execute_compiled = self.execute_compiled
-        self.echo = engine.echo
         self.logger = engine.logger
         self.set_assert_list(None, None)
     def __getattr__(self, key):
@@ -93,8 +92,11 @@ class EngineAssert(object):
         self.assert_list = list
         if list is not None:
             self.assert_list.reverse()
+
+    def _set_echo(self, echo):
+        self.engine.echo = echo
+    echo = property(lambda s: s.engine.echo, _set_echo)
     def execute_compiled(self, compiled, parameters, **kwargs):
-        self.engine.echo = self.echo
         self.engine.logger = self.logger
         statement = str(compiled)