summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2018-01-19 12:05:44 -0500
committerGerrit Code Review <gerrit@ci.zzzcomputing.com>2018-01-19 12:05:44 -0500
commit6ddabc0f0f4a2e460e6fc4f33ff5c3441e874942 (patch)
tree42b78b153e7de4955e6da9c9d3061ea6f5073aad
parenta05a6d06fa7da5e5bcaaf21ceb7a6993a2b32829 (diff)
parente46883e27e7e032915df64e51a53648570a74e07 (diff)
downloadsqlalchemy-6ddabc0f0f4a2e460e6fc4f33ff5c3441e874942.tar.gz
Merge "Add a few more MySQL 8.0 reserved words"
-rw-r--r--doc/build/changelog/unreleased_12/mysql_res.rst6
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py6
2 files changed, 10 insertions, 2 deletions
diff --git a/doc/build/changelog/unreleased_12/mysql_res.rst b/doc/build/changelog/unreleased_12/mysql_res.rst
new file mode 100644
index 000000000..b6d72f9eb
--- /dev/null
+++ b/doc/build/changelog/unreleased_12/mysql_res.rst
@@ -0,0 +1,6 @@
+.. change::
+ :tags: bug, mysql
+
+ Added more MySQL 8.0 reserved words to the MySQL dialect
+ for quoting purposes. Pull request courtesy
+ Riccardo Magliocchetti.
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index b0f0a89ae..a304d04f6 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -768,8 +768,10 @@ RESERVED_WORDS = set(
'generated', 'optimizer_costs', 'stored', 'virtual', # 5.7
- 'admin', 'except', 'grouping', 'of', 'persist', 'recursive',
- 'role', # 8.0
+ '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
])