From: Jason Kirtland <jek@discorporate.us>
Date: Fri, 13 Jul 2007 19:03:02 +0000 (+0000)
Subject: Refinement for r2890, column names should remain unicode.
X-Git-Tag: rel_0_3_9~20
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=3f9fb5540ddf3375d79b7bf91fdac9bc8b34d137;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

Refinement for r2890, column names should remain unicode.
---

diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 92f7cf0a75..5806bee2ec 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -1092,6 +1092,9 @@ class MySQLDialect(ansisql.ANSIDialect):
             (name, type, nullable, primary_key, default) = \
                    (row[0], row[1], row[2] == 'YES', row[3] == 'PRI', row[4])
 
+            # leave column names as unicode
+            name = name.decode(decode_from)
+
             match = re.match(r'(\w+)(\(.*?\))?\s*(\w+)?\s*(\w+)?', type)
             col_type = match.group(1)
             args = match.group(2)