From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Sun, 13 Oct 2013 18:09:35 +0000 (-0400)
Subject: MySQL-connector dialect now allows options in the create_engine
X-Git-Tag: rel_0_8_3~15
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0cea9fd61c59b68dd7e027bec92a67ebbea239fc;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

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]
---

diff --git a/doc/build/changelog/changelog_08.rst b/doc/build/changelog/changelog_08.rst
index 134a683493..a126bcbeb2 100644
--- a/doc/build/changelog/changelog_08.rst
+++ b/doc/build/changelog/changelog_08.rst
@@ -10,6 +10,15 @@
 .. changelog::
     :version: 0.8.3
 
+    .. change::
+        :tags: bug, mysql
+        :tickets: 2515
+        :versions: 0.9.0
+
+        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".
+
     .. change::
         :tags: bug, postgresql
         :tickets: 2742
diff --git a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py
index b1906d3b98..18d4262c99 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.
diff --git a/test/dialect/mysql/test_dialect.py b/test/dialect/mysql/test_dialect.py
index 62bdfc81bb..2ff17f0f73 100644
--- a/test/dialect/mysql/test_dialect.py
+++ b/test/dialect/mysql/test_dialect.py
@@ -9,12 +9,17 @@ from sqlalchemy.testing import engines
 import datetime
 
 class DialectTest(fixtures.TestBase):
-    __only_on__ = 'mysql'
+    def test_ssl_arguments_mysqldb(self):
+        from sqlalchemy.dialects.mysql import mysqldb
+        dialect = mysqldb.dialect()
+        self._test_ssl_arguments(dialect)
 
-    @testing.only_on(['mysql+mysqldb', 'mysql+oursql'],
-                    'requires particular SSL arguments')
-    def test_ssl_arguments(self):
-        dialect = testing.db.dialect
+    def test_ssl_arguments_oursql(self):
+        from sqlalchemy.dialects.mysql import oursql
+        dialect = oursql.dialect()
+        self._test_ssl_arguments(dialect)
+
+    def _test_ssl_arguments(self, dialect):
         kwarg = dialect.create_connect_args(
             make_url("mysql://scott:tiger@localhost:3306/test"
                 "?ssl_ca=/ca.pem&ssl_cert=/cert.pem&ssl_key=/key.pem")
@@ -33,6 +38,50 @@ class DialectTest(fixtures.TestBase):
             }
         )
 
+    def test_mysqlconnector_buffered_arg(self):
+        from sqlalchemy.dialects.mysql import mysqlconnector
+        dialect = mysqlconnector.dialect()
+        kw = dialect.create_connect_args(
+                make_url("mysql+mysqlconnector://u:p@host/db?buffered=true")
+            )[1]
+        eq_(kw['buffered'], True)
+
+        kw = dialect.create_connect_args(
+                make_url("mysql+mysqlconnector://u:p@host/db?buffered=false")
+            )[1]
+        eq_(kw['buffered'], False)
+
+        kw = dialect.create_connect_args(
+                make_url("mysql+mysqlconnector://u:p@host/db")
+            )[1]
+        eq_(kw['buffered'], True)
+
+    def test_mysqlconnector_raise_on_warnings_arg(self):
+        from sqlalchemy.dialects.mysql import mysqlconnector
+        dialect = mysqlconnector.dialect()
+        kw = dialect.create_connect_args(
+                make_url("mysql+mysqlconnector://u:p@host/db?raise_on_warnings=true")
+            )[1]
+        eq_(kw['raise_on_warnings'], True)
+
+        kw = dialect.create_connect_args(
+                make_url("mysql+mysqlconnector://u:p@host/db?raise_on_warnings=false")
+            )[1]
+        eq_(kw['raise_on_warnings'], False)
+
+        kw = dialect.create_connect_args(
+                make_url("mysql+mysqlconnector://u:p@host/db")
+            )[1]
+        eq_(kw['raise_on_warnings'], True)
+
+    @testing.only_on('mysql')
+    def test_random_arg(self):
+        dialect = testing.db.dialect
+        kw = dialect.create_connect_args(
+                make_url("mysql://u:p@host/db?foo=true")
+            )[1]
+        eq_(kw['foo'], "true")
+
 class SQLModeDetectionTest(fixtures.TestBase):
     __only_on__ = 'mysql'