diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-07-31 21:05:33 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2013-07-31 21:05:33 -0400 |
| commit | 25839c064d995b3664f0cef01768961ac5e4807f (patch) | |
| tree | 5962b993b8c938bd606161d213d82bfd51242187 | |
| parent | 5d4094ba739b35775e6e4810b730fab510de7707 (diff) | |
| download | sqlalchemy-25839c064d995b3664f0cef01768961ac5e4807f.tar.gz | |
Updates to MySQL reserved words for versions 5.5, 5.6, courtesy
Hanno Schlichting. Also in 0.8.3, 0.7.11.
[ticket:2791]
| -rw-r--r-- | doc/build/changelog/changelog_07.rst | 7 | ||||
| -rw-r--r-- | doc/build/changelog/changelog_08.rst | 7 | ||||
| -rw-r--r-- | doc/build/changelog/changelog_09.rst | 7 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/base.py | 10 |
4 files changed, 31 insertions, 0 deletions
diff --git a/doc/build/changelog/changelog_07.rst b/doc/build/changelog/changelog_07.rst index 697274558..3504a5134 100644 --- a/doc/build/changelog/changelog_07.rst +++ b/doc/build/changelog/changelog_07.rst @@ -7,6 +7,13 @@ :version: 0.7.11 .. change:: + :tags: mysql, bug + :tickets: 2791 + + Updates to MySQL reserved words for versions 5.5, 5.6, courtesy + Hanno Schlichting. + + .. change:: :tags: sql, bug, cte :tickets: 2783 diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst index 4bac27445..451127fbb 100644 --- a/doc/build/changelog/changelog_08.rst +++ b/doc/build/changelog/changelog_08.rst @@ -7,6 +7,13 @@ :version: 0.8.3 .. change:: + :tags: mysql, bug + :tickets: 2791 + + Updates to MySQL reserved words for versions 5.5, 5.6, courtesy + Hanno Schlichting. Also in 0.7.11. + + .. change:: :tags: sql, bug, cte :tickets: 2783 diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst index 736bcc3c6..666729e8d 100644 --- a/doc/build/changelog/changelog_09.rst +++ b/doc/build/changelog/changelog_09.rst @@ -7,6 +7,13 @@ :version: 0.9.0 .. change:: + :tags: mysql, bug + :tickets: 2791 + + Updates to MySQL reserved words for versions 5.5, 5.6, courtesy + Hanno Schlichting. Also in 0.8.3, 0.7.11. + + .. change:: :tags: sql, bug, cte :tickets: 2783 diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index d5e33c802..1da0497f5 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -318,10 +318,20 @@ RESERVED_WORDS = set( 'union', 'unique', 'unlock', 'unsigned', 'update', 'usage', 'use', 'using', 'utc_date', 'utc_time', 'utc_timestamp', 'values', 'varbinary', 'varchar', 'varcharacter', 'varying', 'when', 'where', 'while', 'with', + 'write', 'x509', 'xor', 'year_month', 'zerofill', # 5.0 + 'columns', 'fields', 'privileges', 'soname', 'tables', # 4.1 + 'accessible', 'linear', 'master_ssl_verify_server_cert', 'range', 'read_only', 'read_write', # 5.1 + + 'general', 'ignore_server_ids', 'master_heartbeat_period', 'maxvalue', + 'resignal', 'signal', 'slow', # 5.5 + + 'get', 'io_after_gtids', 'io_before_gtids', 'master_bind', 'one_shot', + 'partition', 'sql_after_gtids', 'sql_before_gtids', # 5.6 + ]) AUTOCOMMIT_RE = re.compile( |