summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/databases/mysql.py
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2006-10-01 16:41:49 +0000
committerMike Bayer <mike_mp@zzzcomputing.com>2006-10-01 16:41:49 +0000
commit6b69fe51debb64a2eb08a03596f1101f3b7b136d (patch)
tree49d4f72193327bc8b17956892ab470b144194088 /lib/sqlalchemy/databases/mysql.py
parentd7d5eccd3f042830998bfec3642798eff0e9d7c0 (diff)
downloadsqlalchemy-6b69fe51debb64a2eb08a03596f1101f3b7b136d.tar.gz
further str() on values that may come back as unicode
Diffstat (limited to 'lib/sqlalchemy/databases/mysql.py')
-rw-r--r--lib/sqlalchemy/databases/mysql.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 0685397d7..ff2007928 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -327,7 +327,9 @@ class MySQLDialect(ansisql.ANSIDialect):
if not found_table:
found_table = True
- (name, type, nullable, primary_key, default) = (row[0], row[1], row[2] == 'YES', row[3] == 'PRI', row[4])
+ # there is a configuration in ticket:318 where everything is coming back as unicode,
+ # not sure of the reason as of yet
+ (name, type, nullable, primary_key, default) = (str(row[0]), str(row[1]), row[2] == 'YES', row[3] == 'PRI', row[4])
match = re.match(r'(\w+)(\(.*?\))?\s*(\w+)?\s*(\w+)?', type)
col_type = match.group(1)