merge MySQL innodb-by-default test fixes

diff --git a/test/dialect/test_mysql.py b/test/dialect/test_mysql.py
index d794fd2b8c5756ecd65c5e8f0f8fd78e30e837a1..d718a6c7318e28caf520962ec2cb3c3838e9b7e9 100644 (file)
--- a/test/dialect/test_mysql.py
+++ b/test/dialect/test_mysql.py
@@ -2,17 +2,13 @@
 
 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
 

diff --git a/test/lib/schema.py b/test/lib/schema.py
index 0cd38bc647e84f0eeea9e92be1eebb9ea452baba..2328770d567d3241f508031e3effd249848e32cc 100644 (file)
--- a/test/lib/schema.py
+++ b/test/lib/schema.py
@@ -21,6 +21,8 @@ def Table(*args, **kw):
         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.

diff --git a/test/sql/test_metadata.py b/test/sql/test_metadata.py
index aaca06fb420f90bb40800d329f17f429fdaf5227..739065d0db77a7bc8d9f1bacb7c5577e9bb74913 100644 (file)
--- a/test/sql/test_metadata.py
+++ b/test/sql/test_metadata.py
@@ -670,6 +670,7 @@ class MetaDataTest(fixtures.TestBase, ComparesTables):
 
 class TableTest(fixtures.TestBase, AssertsCompiledSQL):
     def test_prefixes(self):
+        from sqlalchemy import Table
         table1 = Table("temporary_table_1", MetaData(),
                       Column("col1", Integer),
                       prefixes = ["TEMPORARY"])