From: David McNelis <dmcnelis@gmail.com>
Date: Wed, 15 Aug 2012 15:22:03 +0000 (-0500)
Subject: Updated mysqlconnector to support client flags and added character set information
X-Git-Tag: rel_0_8_0b1~246
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=4fe37089aad8db9d44d0850fedc0716e3b76161a;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Updated mysqlconnector to support client flags and added character set information
---

diff --git a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py
index 45ca47b8e5..3801118d7c 100644
--- a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py
+++ b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py
@@ -103,13 +103,13 @@ class MySQLDialect_mysqlconnector(MySQLDialect):
         dbapi_con = connection.connection
 
         from mysql.connector.constants import ClientFlag
-        dbapi_con.set_client_flag(ClientFlag.FOUND_ROWS)
+        dbapi_con.set_client_flags([ClientFlag.FOUND_ROWS])
 
         version = dbapi_con.get_server_version()
         return tuple(version)
 
     def _detect_charset(self, connection):
-        return connection.connection.get_characterset_info()
+        return connection.connection.charset
 
     def _extract_error_code(self, exception):
         return exception.errno