Merge "Add reserved word 'function' for MySQL"

zzzeek · Oct 30, 2018 · 4c487b9 · 4c487b9
2 parents f041f1d + 38c8132
commit 4c487b9
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/doc/build/changelog/unreleased_12/4348.rst 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
@@ -814,10 +814,10 @@ def process(element, compiler, **kw):
      '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(