From: Mike Bayer Date: Wed, 29 Aug 2012 16:16:18 +0000 (-0400) Subject: fixes to prevent the new MyISAM engine from breaking other tests X-Git-Tag: rel_0_8_0b1~191 X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=f46f16d4c77252f06ae04891739f8d079ec8a0bd;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git fixes to prevent the new MyISAM engine from breaking other tests --- diff --git a/test/dialect/test_mysql.py b/test/dialect/test_mysql.py index ace63d446f..92eb52624a 100644 --- 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/sql/test_metadata.py b/test/sql/test_metadata.py index aaca06fb42..739065d0db 100644 --- 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"])