summaryrefslogtreecommitdiff
path: root/test/sql
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2017-08-20 18:57:05 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2017-08-20 18:57:05 -0400
commit64032a35ae3dbed0bd5bbdf4d07b3f0094684f87 (patch)
tree33542f65a24aeccbd6f0a15f91d6bac23a4f48f3 /test/sql
parentcc741e1ac7fce9ce7117b4855d56e38749c04868 (diff)
downloadsqlalchemy-64032a35ae3dbed0bd5bbdf4d07b3f0094684f87.tar.gz
- a few mysql fixes, more to come
Change-Id: Icdcc8ed03374251b8d3815ae58e2726ea27c14b4
Diffstat (limited to 'test/sql')
-rw-r--r--test/sql/test_types.py18
1 files changed, 11 insertions, 7 deletions
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 404d42c7a..fdcf53c27 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -1381,10 +1381,13 @@ class EnumTest(AssertsCompiledSQL, fixtures.TablesTest):
t = Table(
'my_table', self.metadata,
Column(
- 'data', Enum("one", "two", "three", name="e1").with_variant(
- Enum("four", "five", "six", name="e2"), "some_other_db"
+ 'data', Enum("one", "two", "three",
+ native_enum=False, name="e1").with_variant(
+ Enum("four", "five", "six", native_enum=False,
+ name="e2"), "some_other_db"
)
- )
+ ),
+ mysql_engine='InnoDB'
)
eq_(
@@ -1395,7 +1398,7 @@ class EnumTest(AssertsCompiledSQL, fixtures.TablesTest):
with testing.db.connect() as conn:
self.metadata.create_all(conn)
assert_raises(
- (exc.IntegrityError, exc.ProgrammingError, exc.DataError),
+ (exc.DBAPIError, ),
conn.execute,
"insert into my_table "
"(data) values('four')")
@@ -1408,8 +1411,9 @@ class EnumTest(AssertsCompiledSQL, fixtures.TablesTest):
t = Table(
'my_table', self.metadata,
Column(
- 'data', Enum("one", "two", "three", name="e1").with_variant(
- Enum("four", "five", "six", name="e2"),
+ 'data', Enum("one", "two", "three", native_enum=False,
+ name="e1").with_variant(
+ Enum("four", "five", "six", native_enum=False, name="e2"),
testing.db.dialect.name
)
)
@@ -1424,7 +1428,7 @@ class EnumTest(AssertsCompiledSQL, fixtures.TablesTest):
with testing.db.connect() as conn:
self.metadata.create_all(conn)
assert_raises(
- (exc.IntegrityError, exc.ProgrammingError, exc.DataError),
+ (exc.DBAPIError, ),
conn.execute,
"insert into my_table "
"(data) values('two')")