merging 0.4 branch to trunk. see CHANGES for details. 0.3 moves to maintenance branch in branches/rel_0_3.

1 files changed, 6 insertions, 5 deletions

diff --git a/test/sql/constraints.py b/test/sql/constraints.py
index 7e1172850..3120185d5 100644
--- a/test/sql/constraints.py
+++ b/test/sql/constraints.py
@@ -1,8 +1,8 @@
 import testbase
 from sqlalchemy import *
-import sys
+from testlib import *
 
-class ConstraintTest(testbase.AssertMixin):
+class ConstraintTest(AssertMixin):
     
     def setUp(self):
         global metadata
@@ -52,7 +52,7 @@ class ConstraintTest(testbase.AssertMixin):
             )
         metadata.create_all()
         
-    @testbase.unsupported('mysql')
+    @testing.unsupported('mysql')
     def test_check_constraint(self):
         foo = Table('foo', metadata, 
             Column('id', Integer, primary_key=True),
@@ -172,12 +172,13 @@ class ConstraintTest(testbase.AssertMixin):
 
         capt = []
         connection = testbase.db.connect()
-        ex = connection._execute
+        # TODO: hacky, put a real connection proxy in
+        ex = connection._Connection__execute
         def proxy(context):
             capt.append(context.statement)
             capt.append(repr(context.parameters))
             ex(context)
-        connection._execute = proxy
+        connection._Connection__execute = proxy
         schemagen = testbase.db.dialect.schemagenerator(connection)
         schemagen.traverse(events)