Commits

Mike Bayer committed 6c62c91 Merge

merge cymysql branch

  • Participants
  • Parent commits c0f0ec6, e990ea2

Comments (0)

Files changed (4)

lib/sqlalchemy/dialects/mysql/base.py

         try:
             try:
                 rs = connection.execute(st)
-                have = rs.rowcount > 0
+                have = len(rs.fetchall()) > 0
                 rs.close()
                 return have
             except exc.DBAPIError, e:

lib/sqlalchemy/dialects/mysql/cymysql.py

     driver = 'cymysql'
 
     description_encoding = None
+    supports_sane_rowcount = False
 
     colspecs = util.update_copy(
         MySQLDialect.colspecs,

test/aaa_profiling/test_memusage.py

         finally:
             metadata.drop_all()
 
+    @testing.crashes('mysql+cymysql', 'blocking with cymysql >= 0.6')
     def test_unicode_warnings(self):
         metadata = MetaData(testing.db)
         table1 = Table('mytable', metadata, Column('col1', Integer,

test/engine/test_transaction.py

File contents unchanged.