- Removed the 'properties' attribute of the

Connection object, Connection.info should be used.
- Method consoliation in Connection, ExecutionContext

4 files changed, 7 insertions, 7 deletions

diff --git a/test/profiling/zoomark.py b/test/profiling/zoomark.py
index a91539d5a..79c954688 100644
--- a/test/profiling/zoomark.py
+++ b/test/profiling/zoomark.py
@@ -340,7 +340,7 @@ class ZooMarkTest(TestBase):
     def test_profile_4_expressions(self):
         self.test_baseline_4_expressions()
 
-    @profiling.function_call_count(1442, {'2.4': 1001})
+    @profiling.function_call_count(1347, {'2.4': 1001})
     def test_profile_5_aggregates(self):
         self.test_baseline_5_aggregates()
 
@@ -348,7 +348,7 @@ class ZooMarkTest(TestBase):
     def test_profile_6_editing(self):
         self.test_baseline_6_editing()
 
-    @profiling.function_call_count(3110, {'2.4': 1998})
+    @profiling.function_call_count(2994, {'2.4': 1998})
     def test_profile_7_multiview(self):
         self.test_baseline_7_multiview()
 
diff --git a/test/profiling/zoomark_orm.py b/test/profiling/zoomark_orm.py
index 7af72b258..edf37ba04 100644
--- a/test/profiling/zoomark_orm.py
+++ b/test/profiling/zoomark_orm.py
@@ -306,7 +306,7 @@ class ZooMarkTest(TestBase):
     def test_profile_4_expressions(self):
         self.test_baseline_4_expressions()
 
-    @profiling.function_call_count(1426)
+    @profiling.function_call_count(1331)
     def test_profile_5_aggregates(self):
         self.test_baseline_5_aggregates()
 
diff --git a/test/sql/constraints.py b/test/sql/constraints.py
index b719ac93d..b7208532c 100644
--- a/test/sql/constraints.py
+++ b/test/sql/constraints.py
@@ -175,12 +175,12 @@ class ConstraintTest(TestBase, AssertsExecutionResults):
         capt = []
         connection = testing.db.connect()
         # TODO: hacky, put a real connection proxy in
-        ex = connection._Connection__execute_raw
+        ex = connection._Connection__execute_context
         def proxy(context):
             capt.append(context.statement)
             capt.append(repr(context.parameters))
             ex(context)
-        connection._Connection__execute_raw = proxy
+        connection._Connection__execute_context = proxy
         schemagen = testing.db.dialect.schemagenerator(testing.db.dialect, connection)
         schemagen.traverse(events)
 
diff --git a/test/testlib/testing.py b/test/testlib/testing.py
index cc7736937..b38968964 100644
--- a/test/testlib/testing.py
+++ b/test/testlib/testing.py
@@ -486,7 +486,7 @@ class ExecutionContextWrapper(object):
         setattr(self.ctx, key, value)
 
     trailing_underscore_pattern = re.compile(r'(\W:[\w_#]+)_\b',re.MULTILINE)
-    def post_execution(self):
+    def post_exec(self):
         ctx = self.ctx
         statement = unicode(ctx.compiled)
         statement = re.sub(r'\n', '', ctx.statement)
@@ -540,7 +540,7 @@ class ExecutionContextWrapper(object):
             testdata.unittest.assert_(equivalent,
                     "Testing for query '%s' params %s, received '%s' with params %s" % (query, repr(params), statement, repr(parameters)))
         testdata.sql_count += 1
-        self.ctx.post_execution()
+        self.ctx.post_exec()
 
     def convert_statement(self, query):
         paramstyle = self.ctx.dialect.paramstyle