From: Michael Trier <mtrier@gmail.com>
Date: Thu, 23 Apr 2009 01:38:09 +0000 (+0000)
Subject: Corrected mysql import for CLIENT_FLAGS. Added commented out memoize decorators that... 
X-Git-Tag: rel_0_6_6~227
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8a161ed37c8838c7965b730df9503c0a5422fc5f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Corrected mysql import for CLIENT_FLAGS. Added commented out memoize decorators that will not work without a ProxyConnection.
---

diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index ac99703776..00705b7ec1 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -2010,9 +2010,11 @@ class MySQLDialect(default.DefaultDialect):
             lc_alias = schema._get_table_key(table.name, table.schema)
             table.metadata.tables[lc_alias] = table
 
+    #@engine_base.connection_memoize(('mysql', 'charset'))
     def _detect_charset(self, connection):
         raise NotImplementedError()
 
+    #@engine_base.connection_memoize(('mysql', 'lower_case_table_names'))
     def _detect_casing(self, connection):
         """Sniff out identifier case sensitivity.
 
@@ -2040,6 +2042,7 @@ class MySQLDialect(default.DefaultDialect):
             row.close()
         return cs
 
+    #@engine_base.connection_memoize(('mysql', 'collations'))
     def _detect_collations(self, connection):
         """Pull the active COLLATIONS list from the server.
 
diff --git a/lib/sqlalchemy/dialects/mysql/mysqldb.py b/lib/sqlalchemy/dialects/mysql/mysqldb.py
index 937c112404..57c919f113 100644
--- a/lib/sqlalchemy/dialects/mysql/mysqldb.py
+++ b/lib/sqlalchemy/dialects/mysql/mysqldb.py
@@ -93,7 +93,7 @@ class MySQL_mysqldb(MySQLDialect):
         client_flag = opts.get('client_flag', 0)
         if self.dbapi is not None:
             try:
-                CLIENT_FLAGS = __import__('MySQLdb.constants').constants.CLIENT
+                import MySQLdb.constants.CLIENT as CLIENT_FLAGS
                 client_flag |= CLIENT_FLAGS.FOUND_ROWS
             except:
                 pass
@@ -103,7 +103,8 @@ class MySQL_mysqldb(MySQLDialect):
     def do_ping(self, connection):
         connection.ping()
 
-    def _get_server_version_info(self,connection):
+    #@engine_base.connection_memoize(('mysql', 'server_version_info'))
+    def _get_server_version_info(self, connection):
         dbapi_con = connection.connection
         version = []
         r = re.compile('[.\-]')
@@ -158,4 +159,4 @@ class MySQL_mysqldb(MySQLDialect):
                 return 'latin1'
 
 
-dialect = MySQL_mysqldb
\ No newline at end of file
+dialect = MySQL_mysqldb