diff options
| -rw-r--r-- | CHANGES | 5 | ||||
| -rw-r--r-- | lib/sqlalchemy/databases/mysql.py | 16 |
2 files changed, 17 insertions, 4 deletions
@@ -97,7 +97,10 @@ which features LIMIT/OFFSET. oracle dialect needs to modify the object to have ROW_NUMBER OVER and wasn't performing the full series of steps on successive compiles. - +- mysql + - support for SSL arguments given as inline within URL query string, + prefixed with "ssl_", courtesy terjeros@gmail.com. + 0.3.6 - sql: - bindparam() names are now repeatable! specify two diff --git a/lib/sqlalchemy/databases/mysql.py b/lib/sqlalchemy/databases/mysql.py index 52aa03003..cc503215a 100644 --- a/lib/sqlalchemy/databases/mysql.py +++ b/lib/sqlalchemy/databases/mysql.py @@ -293,8 +293,18 @@ class MySQLDialect(ansisql.ANSIDialect): # note: these two could break SA Unicode type util.coerce_kw_type(opts, 'use_unicode', bool) util.coerce_kw_type(opts, 'charset', str) - # TODO: what about options like "ssl", "cursorclass" and "conv" ? - + + # ssl + ssl = {} + for key in ['ssl_ca', 'ssl_key', 'ssl_cert', 'ssl_capath', 'ssl_cipher']: + if key in opts: + ssl[key[4:]] = opts[key] + util.coerce_kw_type(ssl, key[4:], str) + del opts[key] + if len(ssl): + opts['ssl'] = ssl + + # TODO: what about options like "cursorclass" and "conv" ? client_flag = opts.get('client_flag', 0) if self.dbapi is not None: try: @@ -302,7 +312,7 @@ class MySQLDialect(ansisql.ANSIDialect): client_flag |= CLIENT_FLAGS.FOUND_ROWS except: pass - opts['client_flag'] = client_flag + opts['client_flag'] = client_flag return [[], opts] def create_execution_context(self, *args, **kwargs): |