summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy
diff options
context:
space:
mode:
authormike bayer <mike_mp@zzzcomputing.com>2020-08-12 15:04:21 +0000
committerGerrit Code Review <gerrit@bbpush.zzzcomputing.com>2020-08-12 15:04:21 +0000
commitcf3a2a991c82f410b9ce82a589a162b2a2ec529e (patch)
treebe7f6906bb26edbc173d8e5d0fd356ba568e02fc /lib/sqlalchemy
parent180ae7c1a53385f72b0047496ac001ec5099cc3e (diff)
parent32e0b128f6c077017673f7049e2b667bf96f53e3 (diff)
downloadsqlalchemy-cf3a2a991c82f410b9ce82a589a162b2a2ec529e.tar.gz
Merge "Fix mysql CREATE TABLE / COLLATE issue"
Diffstat (limited to 'lib/sqlalchemy')
-rw-r--r--lib/sqlalchemy/dialects/mysql/base.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py
index 90945ebad..eea86bf75 100644
--- a/lib/sqlalchemy/dialects/mysql/base.py
+++ b/lib/sqlalchemy/dialects/mysql/base.py
@@ -1796,6 +1796,8 @@ class MySQLDDLCompiler(compiler.DDLCompiler):
[
("DEFAULT_CHARSET", "COLLATE"),
("DEFAULT_CHARACTER_SET", "COLLATE"),
+ ("CHARSET", "COLLATE"),
+ ("CHARACTER_SET", "COLLATE"),
],
nonpart_options,
):