Commits

Mike Bayer committed 31fc095

merge MySQL innodb-by-default test fixes

  • Participants
  • Parent commits 40d114e
  • Branches rel_0_7

Comments (0)

Files changed (3)

test/dialect/test_mysql.py

 
 from test.lib.testing import eq_, assert_raises, assert_raises_message
 
-# Py2K
-import sets
-# end Py2K
 
 from sqlalchemy import *
-from sqlalchemy import sql, exc, schema, types as sqltypes, event
+from sqlalchemy import sql, exc, schema, types as sqltypes
 from sqlalchemy.dialects.mysql import base as mysql
 from sqlalchemy.engine.url import make_url
-
-from test.lib.testing import eq_
-from test.lib import *
+from test.lib import fixtures, AssertsCompiledSQL, AssertsExecutionResults
+from test.lib import testing, engines
 from test.lib.engines import utf8_engine
 import datetime
 

test/lib/schema.py

         if 'mysql_engine' not in kw and 'mysql_type' not in kw:
             if 'test_needs_fk' in test_opts or 'test_needs_acid' in test_opts:
                 kw['mysql_engine'] = 'InnoDB'
+            else:
+                kw['mysql_engine'] = 'MyISAM'
 
     # Apply some default cascading rules for self-referential foreign keys.
     # MySQL InnoDB has some issues around seleting self-refs too.

test/sql/test_metadata.py

 
 class TableTest(fixtures.TestBase, AssertsCompiledSQL):
     def test_prefixes(self):
+        from sqlalchemy import Table
         table1 = Table("temporary_table_1", MetaData(),
                       Column("col1", Integer),
                       prefixes = ["TEMPORARY"])