Merged in nakagami/sqlalchemy/cymysql (pull request #42)

cymysql support

6 files changed, 20 insertions, 3 deletions

diff --git a/test/dialect/test_mysql.py b/test/dialect/test_mysql.py
index d5ce6e923..f89b0b229 100644
--- a/test/dialect/test_mysql.py
+++ b/test/dialect/test_mysql.py
@@ -1500,6 +1500,7 @@ class MatchTest(fixtures.TestBase, AssertsCompiledSQL):
 
     @testing.fails_on('mysql+mysqldb', 'uses format')
     @testing.fails_on('mysql+pymysql', 'uses format')
+    @testing.fails_on('mysql+cymysql', 'uses format')
     @testing.fails_on('mysql+oursql', 'uses format')
     @testing.fails_on('mysql+pyodbc', 'uses format')
     @testing.fails_on('mysql+zxjdbc', 'uses format')
diff --git a/test/engine/test_execute.py b/test/engine/test_execute.py
index 447324d6e..203d7bd71 100644
--- a/test/engine/test_execute.py
+++ b/test/engine/test_execute.py
@@ -110,7 +110,7 @@ class ExecuteTest(fixtures.TestBase):
 
     # some psycopg2 versions bomb this.
     @testing.fails_on_everything_except('mysql+mysqldb', 'mysql+pymysql',
-            'mysql+mysqlconnector', 'postgresql')
+            'mysql+cymysql', 'mysql+mysqlconnector', 'postgresql')
     @testing.fails_on('postgresql+zxjdbc', 'sprintf not supported')
     def test_raw_sprintf(self):
         def go(conn):
@@ -157,7 +157,7 @@ class ExecuteTest(fixtures.TestBase):
                      'db-api flaky')
     @testing.fails_on_everything_except('postgresql+psycopg2',
             'postgresql+pypostgresql', 'mysql+mysqlconnector',
-            'mysql+pymysql')
+            'mysql+pymysql', 'mysql+cymysql')
     def test_raw_python(self):
         def go(conn):
             conn.execute('insert into users (user_id, user_name) '
diff --git a/test/engine/test_reconnect.py b/test/engine/test_reconnect.py
index 6416ce149..6b283654b 100644
--- a/test/engine/test_reconnect.py
+++ b/test/engine/test_reconnect.py
@@ -487,6 +487,9 @@ class InvalidateDuringResultTest(fixtures.TestBase):
         meta.drop_all()
         engine.dispose()
 
+    @testing.fails_on('+cymysql',
+                      "Buffers the result set and doesn't check for "
+                      "connection close")
     @testing.fails_on('+pymysql',
                       "Buffers the result set and doesn't check for "
                       "connection close")
diff --git a/test/engine/test_transaction.py b/test/engine/test_transaction.py
index ad6813f87..5558ff778 100644
--- a/test/engine/test_transaction.py
+++ b/test/engine/test_transaction.py
@@ -29,6 +29,7 @@ class TransactionTest(fixtures.TestBase):
         testing.db.execute(users.delete()).close()
 
     @classmethod
+    @testing.crashes('mysql+cymysql', 'deadlock')
     def teardown_class(cls):
         users.drop(testing.db)
 
diff --git a/test/requirements.py b/test/requirements.py
index 738429158..c20bcbd0a 100644
--- a/test/requirements.py
+++ b/test/requirements.py
@@ -378,6 +378,7 @@ class DefaultRequirements(SuiteRequirements):
         """
         return fails_on_everything_except('mysql+mysqldb', 'mysql+oursql',
                                       'sqlite+pysqlite', 'mysql+pymysql',
+                                      'mysql+cymysql',
                                       'sybase', 'mssql+pyodbc', 'mssql+mxodbc')
 
     @property
@@ -393,7 +394,8 @@ class DefaultRequirements(SuiteRequirements):
 
         """
         return fails_on_everything_except('mysql+mysqldb', 'mysql+oursql',
-                                       'sqlite+pysqlite', 'mysql+pymysql')
+                                       'sqlite+pysqlite', 'mysql+pymysql',
+                                       'mysql+cymysql')
 
     @property
     def sane_multi_rowcount(self):
diff --git a/test/sql/test_types.py b/test/sql/test_types.py
index 0e6f1b5f0..3c981e539 100644
--- a/test/sql/test_types.py
+++ b/test/sql/test_types.py
@@ -690,6 +690,16 @@ class UnicodeTest(fixtures.TestBase):
                 ('charset' in testing.db.url.query)
             )
 
+        elif testing.against('mysql+cymysql'):
+            eq_(
+                testing.db.dialect.returns_unicode_strings,
+                # Py3K
+                #True
+                # Py2K
+                False
+                # end Py2K
+            )
+
         else:
             expected = (testing.db.name, testing.db.driver) in \
                 (