manytomany test shows that mysql needs column lengths on string to be used as a prima...

testbase simplified slightly, allowed by reorganiztion of engine's execution of compiled objects

diff --git a/test/manytomany.py b/test/manytomany.py
index 43e6999592d81fe2ea1cf4dfca4909850463035c..6d011264bcb885948c9a4ed181bac37a0c3957b2 100644 (file)
--- a/test/manytomany.py
+++ b/test/manytomany.py
@@ -134,13 +134,13 @@ class M2MTest2(testbase.AssertMixin):
     def setUpAll(self):
         db = testbase.db
         global studentTbl
-        studentTbl = Table('student', db, Column('name', String, primary_key=True))
+        studentTbl = Table('student', db, Column('name', String(20), primary_key=True))
         global courseTbl
-        courseTbl = Table('course', db, Column('name', String, primary_key=True))
+        courseTbl = Table('course', db, Column('name', String(20), primary_key=True))
         global enrolTbl
         enrolTbl = Table('enrol', db,
-            Column('student_id', String, ForeignKey('student.name'),primary_key=True),
-            Column('course_id', String, ForeignKey('course.name'), primary_key=True))
+            Column('student_id', String(20), ForeignKey('student.name'),primary_key=True),
+            Column('course_id', String(20), ForeignKey('course.name'), primary_key=True))
 
         studentTbl.create()
         courseTbl.create()
@@ -156,9 +156,9 @@ class M2MTest2(testbase.AssertMixin):
         clear_mappers()
 
     def tearDown(self):
+        enrolTbl.delete().execute()
         courseTbl.delete().execute()
         studentTbl.delete().execute()
-        enrolTbl.delete().execute()
 
     def testcircular(self): 
         class Student(object):

diff --git a/test/testbase.py b/test/testbase.py
index 49bc6bfb5eaa6ac6ffff9ca55aebeadfa3294079..435e26b7628ffc581cf1507b1748427a8ad50060 100644 (file)
--- a/test/testbase.py
+++ b/test/testbase.py
@@ -97,7 +97,7 @@ class EngineAssert(object):
         self.engine.echo = self.echo
         self.engine.logger = self.logger
         
-        if self.assert_list is not None and not (isinstance(self.engine, postgres.PGSQLEngine) and re.search(r'%\(.*oid\)s', statement, re.S)):
+        if self.assert_list is not None:
             item = self.assert_list.pop()
             (query, params) = item
             if callable(params):
@@ -164,8 +164,8 @@ class TTestSuite(unittest.TestSuite):
         unittest.TestSuite.__init__(self, tests)
 
     def do_run(self, result):
-       """nice job unittest !  you switched __call__ and run() between py2.3 and 2.4 thereby
-       making straight subclassing impossible !"""
+        """nice job unittest !  you switched __call__ and run() between py2.3 and 2.4 thereby
+        making straight subclassing impossible !"""
         for test in self._tests:
             if result.shouldStop:
                 break