diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-08-25 15:26:02 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-08-25 16:53:49 -0400 |
| commit | 2392ae1900f112c44ed966783d1dedfb88f13353 (patch) | |
| tree | 405791ed1dacde958b0e5be9f4a36bd66190345e /lib/sqlalchemy/dialects | |
| parent | 887fb3ebaad20847edc752f5fcf072ace947d56a (diff) | |
| download | sqlalchemy-2392ae1900f112c44ed966783d1dedfb88f13353.tar.gz | |
Apply percent sign escaping to literal binds, comments
Fixed bug in new percent-sign support (e.g. :ticket:`3740`) where a bound
parameter rendered with literal_binds would fail to escape percent-signs
for relevant dialects. In addition, ensured new table / column comment
support feature also fully makes use of literal-rendered parameters so that
this percent sign support takes place with table / column comment DDL as
well, allowing percent sign support for the mysql / psycopg2 backends that
require escaping of percent signs.
Change-Id: Ia4136a300933e9bc6a01a7b9afd5c7b9a3fee4e3
Fixes: #4054
Fixes: #4052
Diffstat (limited to 'lib/sqlalchemy/dialects')
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/base.py | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index 0cffae389..9d6dd7188 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -1171,7 +1171,9 @@ class MySQLDDLCompiler(compiler.DDLCompiler): ], nonpart_options): arg = opts[opt] if opt in _reflection._options_of_type_string: - arg = "'%s'" % arg.replace("\\", "\\\\").replace("'", "''") + + arg = self.sql_compiler.render_literal_value( + arg, sqltypes.String()) if opt in ('DATA_DIRECTORY', 'INDEX_DIRECTORY', 'DEFAULT_CHARACTER_SET', 'CHARACTER_SET', @@ -1196,7 +1198,8 @@ class MySQLDDLCompiler(compiler.DDLCompiler): ], part_options): arg = opts[opt] if opt in _reflection._options_of_type_string: - arg = "'%s'" % arg.replace("\\", "\\\\").replace("'", "''") + arg = self.sql_compiler.render_literal_value( + arg, sqltypes.String()) opt = opt.replace('_', ' ') joiner = ' ' |