summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/databases/mysql.py
diff options
context:
space:
mode:
authorJason Kirtland <jek@discorporate.us>2007-07-13 19:03:02 +0000
committerJason Kirtland <jek@discorporate.us>2007-07-13 19:03:02 +0000
commit3f9fb5540ddf3375d79b7bf91fdac9bc8b34d137 (patch)
treecfa9cc554af50cba515e3c366fa30bb318910218 /lib/sqlalchemy/databases/mysql.py
parent28f74e1abe59270553a00a50c2e5b4becb0349c0 (diff)
downloadsqlalchemy-3f9fb5540ddf3375d79b7bf91fdac9bc8b34d137.tar.gz
Refinement for r2890, column names should remain unicode.
Diffstat (limited to 'lib/sqlalchemy/databases/mysql.py')
-rw-r--r--lib/sqlalchemy/databases/mysql.py3
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 92f7cf0a7..5806bee2e 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)