From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Fri, 25 Jul 2014 16:02:05 +0000 (-0400)
Subject: - use a variant with expected collation here for mysql
X-Git-Tag: rel_1_0_0b1~286
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=8560522ff0244c93dab62276f9ba445df90f0d39;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

- use a variant with expected collation here for mysql
---

diff --git a/test/orm/test_unitofwork.py b/test/orm/test_unitofwork.py
index 3f785a58bd..6eb7632130 100644
--- a/test/orm/test_unitofwork.py
+++ b/test/orm/test_unitofwork.py
@@ -61,11 +61,8 @@ class UnicodeTest(fixtures.MappedTest):
 
     @classmethod
     def define_tables(cls, metadata):
-        if testing.against('mysql+oursql'):
-            from sqlalchemy.dialects.mysql import VARCHAR
-            uni_type = VARCHAR(50, collation='utf8_unicode_ci')
-        else:
-            uni_type = sa.Unicode(50)
+        uni_type = sa.Unicode(50).with_variant(
+            sa.Unicode(50, collation="utf8_unicode_ci"), "mysql")
 
         Table('uni_t1', metadata,
             Column('id',  Integer, primary_key=True,