summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/databases/mysql.py
diff options
context:
space:
mode:
authorJason Kirtland <jek@discorporate.us>2008-10-28 21:32:24 +0000
committerJason Kirtland <jek@discorporate.us>2008-10-28 21:32:24 +0000
commit554f223f6b6af9bf2dd387e146a1c67650599ed6 (patch)
tree7ce68adccca3ff8c12f97128b17f3eefce9e7404 /lib/sqlalchemy/databases/mysql.py
parent231839e0379330ce5206febaa22d690b2c2b230e (diff)
downloadsqlalchemy-554f223f6b6af9bf2dd387e146a1c67650599ed6.tar.gz
Accept USING as a prefix or postfix modifer when reflecting keys. [ticket:1117]
Diffstat (limited to 'lib/sqlalchemy/databases/mysql.py')
-rw-r--r--lib/sqlalchemy/databases/mysql.py3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py
index 0c22d6881..daa24e469 100644
--- a/lib/sqlalchemy/databases/mysql.py
+++ b/lib/sqlalchemy/databases/mysql.py
@@ -2481,8 +2481,9 @@ class MySQLSchemaReflector(object):
r' '
r'(?:(?P<type>\S+) )?KEY'
r'(?: +%(iq)s(?P<name>(?:%(esc_fq)s|[^%(fq)s])+)%(fq)s)?'
- r'(?: +USING +(?P<using>\S+))?'
+ r'(?: +USING +(?P<using_pre>\S+))?'
r' +\((?P<columns>.+?)\)'
+ r'(?: +USING +(?P<using_post>\S+))?'
r'(?: +KEY_BLOCK_SIZE +(?P<keyblock>\S+))?'
r'(?: +WITH PARSER +(?P<parser>\S+))?'
r',?$'