From 353d416341d33ce4122a9becde45e75fbe479752 Mon Sep 17 00:00:00 2001 From: Alex Hall Date: Tue, 30 Oct 2018 13:00:49 -0400 Subject: [PATCH] Add reserved word 'function' for MySQL Added word ``function`` to the list of reserved words for MySQL, which is now a keyword in MySQL 8.0 Fixes: #4348 Change-Id: Idd30acda7e99076810f65d0ee860055a18dc9193 Pull-request: https://github.com/zzzeek/sqlalchemy/pull/481 (cherry picked from commit 38c81328e91884f71af175a115dfdb423d8f4910) --- doc/build/changelog/unreleased_12/4348.rst | 6 ++++++ lib/sqlalchemy/dialects/mysql/base.py | 8 ++++---- 2 files changed, 10 insertions(+), 4 deletions(-) create mode 100644 doc/build/changelog/unreleased_12/4348.rst diff --git a/doc/build/changelog/unreleased_12/4348.rst b/doc/build/changelog/unreleased_12/4348.rst new file mode 100644 index 0000000000..5b40ec609f --- /dev/null +++ b/doc/build/changelog/unreleased_12/4348.rst @@ -0,0 +1,6 @@ +.. change:: + :tags: bug, mysql + :tickets: 4348 + + Added word ``function`` to the list of reserved words for MySQL, which is + now a keyword in MySQL 8.0 diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index 2a52de06cf..4972872c91 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -776,10 +776,10 @@ RESERVED_WORDS = set( 'generated', 'optimizer_costs', 'stored', 'virtual', # 5.7 'admin', 'cume_dist', 'empty', 'except', 'first_value', 'grouping', - 'groups', 'json_table', 'last_value', 'nth_value', 'ntile', 'of', - 'over', 'percent_rank', 'persist', 'persist_only', 'rank', 'recursive', - 'role', 'row', 'rows', 'row_number', 'system', 'window', # 8.0 - + 'function', 'groups', 'json_table', 'last_value', 'nth_value', + 'ntile', 'of', 'over', 'percent_rank', 'persist', 'persist_only', + 'rank', 'recursive', 'role', 'row', 'rows', 'row_number', 'system', + 'window', # 8.0 ]) AUTOCOMMIT_RE = re.compile( -- 2.47.2