summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorMike Bayer <mike_mp@zzzcomputing.com>2013-10-13 14:09:35 -0400
committerMike Bayer <mike_mp@zzzcomputing.com>2013-10-13 14:09:53 -0400
commit0cea9fd61c59b68dd7e027bec92a67ebbea239fc (patch)
treefedfe3fec1dd98777ed258c4c9dfa2e472c0a1b8 /lib
parent70fdd3efa7a9a9a0fcf6cebf0853c44f04cf9a04 (diff)
downloadsqlalchemy-0cea9fd61c59b68dd7e027bec92a67ebbea239fc.tar.gz
MySQL-connector dialect now allows options in the create_engine
query string to override those defaults set up in the connect, including "buffered" and "raise_on_warnings". [ticket:2515]
Diffstat (limited to 'lib')
-rw-r--r--lib/sqlalchemy/dialects/mysql/mysqlconnector.py5
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py
index b1906d3b9..18d4262c9 100644
--- a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py
+++ b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py
@@ -79,12 +79,13 @@ class MySQLDialect_mysqlconnector(MySQLDialect):
def create_connect_args(self, url):
opts = url.translate_connect_args(username='user')
+
opts.update(url.query)
util.coerce_kw_type(opts, 'buffered', bool)
util.coerce_kw_type(opts, 'raise_on_warnings', bool)
- opts['buffered'] = True
- opts['raise_on_warnings'] = True
+ opts.setdefault('buffered', True)
+ opts.setdefault('raise_on_warnings', True)
# FOUND_ROWS must be set in ClientFlag to enable
# supports_sane_rowcount.