diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-02-10 05:46:03 +0000 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2010-02-10 05:46:03 +0000 |
| commit | 10b14a6c5c73a2db7517f705d857051ca107d504 (patch) | |
| tree | e8f9e1b459b80051323c078cc5bd2c6ad3a98f95 /lib/sqlalchemy | |
| parent | 5e2b2bbd95106cfc60df532da3f215f14da82961 (diff) | |
| download | sqlalchemy-10b14a6c5c73a2db7517f705d857051ca107d504.tar.gz | |
- Fixed reflection bug whereby when COLLATE was present,
nullable flag and server defaults would not be reflected.
[ticket:1655]
Diffstat (limited to 'lib/sqlalchemy')
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/base.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index 1a85babe4..77b13c1a7 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -2331,8 +2331,8 @@ class MySQLTableDefinitionParser(object): r'(?:\x27(?:\x27\x27|[^\x27])*\x27,?)+))\))?' r'(?: +(?P<unsigned>UNSIGNED))?' r'(?: +(?P<zerofill>ZEROFILL))?' - r'(?: +CHARACTER SET +(?P<charset>\w+))?' - r'(?: +COLLATE +(P<collate>\w+))?' + r'(?: +CHARACTER SET +(?P<charset>[\w_]+))?' + r'(?: +COLLATE +(?P<collate>[\w_]+))?' r'(?: +(?P<notnull>NOT NULL))?' r'(?: +DEFAULT +(?P<default>' r'(?:NULL|\x27(?:\x27\x27|[^\x27])*\x27|\w+)' |