diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-04-21 17:19:07 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-04-21 17:19:07 -0400 |
| commit | e4c50c07bb67f30d9e67167c34cfcae9d50ad360 (patch) | |
| tree | 5ee6e43d4c053d54a1cf17c2ab32ebdf07aa017f | |
| parent | 23c744b54e94a0d003a7e7236af7868cc31a1161 (diff) | |
| parent | 3aff498e4a96eda06f09f09f98e73e135719b388 (diff) | |
| download | sqlalchemy-e4c50c07bb67f30d9e67167c34cfcae9d50ad360.tar.gz | |
merge cymysql branch
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/base.py | 2 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/cymysql.py | 1 | ||||
| -rw-r--r-- | test/aaa_profiling/test_memusage.py | 1 |
3 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index b55bc1090..d56ab137c 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -2042,7 +2042,7 @@ class MySQLDialect(default.DefaultDialect): try: try: rs = connection.execute(st) - have = rs.rowcount > 0 + have = len(rs.fetchall()) > 0 rs.close() return have except exc.DBAPIError, e: diff --git a/lib/sqlalchemy/dialects/mysql/cymysql.py b/lib/sqlalchemy/dialects/mysql/cymysql.py index d9b43869c..0806f63b4 100644 --- a/lib/sqlalchemy/dialects/mysql/cymysql.py +++ b/lib/sqlalchemy/dialects/mysql/cymysql.py @@ -43,6 +43,7 @@ class MySQLDialect_cymysql(MySQLDialect_mysqldb): driver = 'cymysql' description_encoding = None + supports_sane_rowcount = False colspecs = util.update_copy( MySQLDialect.colspecs, diff --git a/test/aaa_profiling/test_memusage.py b/test/aaa_profiling/test_memusage.py index 05be39002..57bddc859 100644 --- a/test/aaa_profiling/test_memusage.py +++ b/test/aaa_profiling/test_memusage.py @@ -307,6 +307,7 @@ class MemUsageTest(EnsureZeroed): 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, |