summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2018-10-30 21:23:49 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2018-10-30 21:23:49 +0000
commit4c487b9477de353b1eb90040a038cabf8787e97d (patch)
tree8f05115d15a4cf65a4626641f126da47f7cd39e0 /lib
parentf041f1d198689cc6bc0a52377e5d50dcc07a29f0 (diff)
parent38c81328e91884f71af175a115dfdb423d8f4910 (diff)
downloadsqlalchemy-4c487b9477de353b1eb90040a038cabf8787e97d.tar.gz
Merge "Add reserved word 'function' for MySQL"
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py8
1 files changed, 4 insertions, 4 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 07eca78bb..23e482d2b 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -814,10 +814,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(