summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2012-04-12 12:16:48 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2012-04-12 12:16:48 -0400
commitba199ce80ccc7ab20fc254790b0537665c650b9f (patch)
tree4675a25250f46f0df6e5278154ddb08cec420f71 /lib/sqlalchemy
parent747f5edd2192caae4ab79ff7dc9d79045b5bad0c (diff)
parent9596595dcf3e52da4be7a3d0f33ed96482b1c254 (diff)
downloadsqlalchemy-ba199ce80ccc7ab20fc254790b0537665c650b9f.tar.gz
Merged in elazar/sqlalchemy/fix/mysql-system-views (pull request #6)
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 65c2c59b9..7d856f0b7 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -2021,7 +2021,6 @@ class MySQLDialect(default.DefaultDialect):
@reflection.cache
def get_view_names(self, connection, schema=None, **kw):
- charset = self._connection_charset
if self.server_version_info < (5, 0, 2):
raise NotImplementedError
if schema is None:
@@ -2032,7 +2031,7 @@ class MySQLDialect(default.DefaultDialect):
rp = connection.execute("SHOW FULL TABLES FROM %s" %
self.identifier_preparer.quote_identifier(schema))
return [row[0] for row in self._compat_fetchall(rp, charset=charset)\
- if row[1] == 'VIEW']
+ if 'VIEW' in row[1]]
@reflection.cache
def get_table_options(self, connection, table_name, schema=None, **kw):