From 527dc29f76ccf4ab309721393fc9ef3ab176d415 Mon Sep 17 00:00:00 2001 From: Kevin Kirsche Date: Mon, 18 Oct 2021 18:11:09 -0400 Subject: [PATCH] fix: missing reserved words --- lib/sqlalchemy/dialects/mysql/base.py | 1 - lib/sqlalchemy/dialects/mysql/reserved_words.py | 16 ++++++++++++++-- 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index c74378512b..bacc5130eb 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -1005,7 +1005,6 @@ from ...types import VARBINARY from ...util import topological - AUTOCOMMIT_RE = re.compile( r"\s*(?:UPDATE|INSERT|CREATE|DELETE|DROP|ALTER|LOAD +DATA|REPLACE)", re.I | re.UNICODE, diff --git a/lib/sqlalchemy/dialects/mysql/reserved_words.py b/lib/sqlalchemy/dialects/mysql/reserved_words.py index 400d02172a..5e84af3f18 100644 --- a/lib/sqlalchemy/dialects/mysql/reserved_words.py +++ b/lib/sqlalchemy/dialects/mysql/reserved_words.py @@ -46,6 +46,7 @@ RESERVED_WORDS = set( "cube", "cume_dist", "current_date", + "current_role", "current_time", "current_timestamp", "current_user", @@ -68,6 +69,7 @@ RESERVED_WORDS = set( "distinct", "distinctrow", "div", + "do_domain_ids", "double", "drop", "dual", @@ -108,6 +110,7 @@ RESERVED_WORDS = set( "hour_second", "if", "ignore", + "ignore_domain_ids", "ignore_server_ids", "in", "index", @@ -123,6 +126,7 @@ RESERVED_WORDS = set( "int4", "int8", "integer", + "intersect", "interval", "into", "io_after_gtids", @@ -157,7 +161,6 @@ RESERVED_WORDS = set( "master_bind", "master_heartbeat_period", "master_ssl_verify_server_cert", - "master_ssl_verify_server_cert", "match", "maxvalue", "mediumblob", @@ -178,6 +181,7 @@ RESERVED_WORDS = set( "null", "numeric", "of", + "offset", "on", "one_shot", "optimize", @@ -190,7 +194,10 @@ RESERVED_WORDS = set( "outer", "outfile", "over", + "page_checksum", + "parse_vcol_expr", "partition", + "position", "percent_rank", "persist", "persist_only", @@ -200,7 +207,6 @@ RESERVED_WORDS = set( "procedure", "purge", "range", - "range", "rank", "read", "read_only", @@ -210,6 +216,7 @@ RESERVED_WORDS = set( "reads", "real", "recursive", + "ref_system_id", "references", "regexp", "release", @@ -220,6 +227,7 @@ RESERVED_WORDS = set( "resignal", "restrict", "return", + "returning", "revoke", "right", "rlike", @@ -245,6 +253,7 @@ RESERVED_WORDS = set( "sql_after_gtids", "sql_before_gtids", # 5.6 "sql_big_result", + "sql_small_result", "sql_calc_found_rows", "sql_small_result", "sqlexception", @@ -253,6 +262,9 @@ RESERVED_WORDS = set( "ssl", "starting", "status", + "stats_auto_recalc", + "stats_persistent", + "stats_sample_pages", "stored", "straight_join", "system", -- 2.47.3