diff options
| author | mike bayer <mike_mp@zzzcomputing.com> | 2018-11-30 18:11:14 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@bbpush.zzzcomputing.com> | 2018-11-30 18:11:14 +0000 |
| commit | 039d8a31f59fa8241d30a79c2ab4d05546156d31 (patch) | |
| tree | 733949e04931343ba58e1167909ff0386043b35d | |
| parent | f778b8a8e02b39cd3b583df0c5eee448bae107b3 (diff) | |
| parent | d99e17a7750069880c51a273f08f42fb75c3923d (diff) | |
| download | sqlalchemy-039d8a31f59fa8241d30a79c2ab4d05546156d31.tar.gz | |
Merge "Add the write_timeout option for mysql." into rel_1_2
| -rw-r--r-- | doc/build/changelog/unreleased_12/4381.rst | 6 | ||||
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/mysqldb.py | 1 | ||||
| -rw-r--r-- | test/dialect/mysql/test_dialect.py | 1 |
3 files changed, 8 insertions, 0 deletions
diff --git a/doc/build/changelog/unreleased_12/4381.rst b/doc/build/changelog/unreleased_12/4381.rst new file mode 100644 index 000000000..8e6dff954 --- /dev/null +++ b/doc/build/changelog/unreleased_12/4381.rst @@ -0,0 +1,6 @@ +.. change:: + :tag: feature, mysql + :tickets: 4381 + + Added support for the ``write_timeout`` flag accepted by mysqlclient and + pymysql to be passed in the URL string. diff --git a/lib/sqlalchemy/dialects/mysql/mysqldb.py b/lib/sqlalchemy/dialects/mysql/mysqldb.py index 535c8ec52..d397b5c20 100644 --- a/lib/sqlalchemy/dialects/mysql/mysqldb.py +++ b/lib/sqlalchemy/dialects/mysql/mysqldb.py @@ -138,6 +138,7 @@ class MySQLDialect_mysqldb(MySQLDialect): util.coerce_kw_type(opts, 'compress', bool) util.coerce_kw_type(opts, 'connect_timeout', int) util.coerce_kw_type(opts, 'read_timeout', int) + util.coerce_kw_type(opts, 'write_timeout', int) util.coerce_kw_type(opts, 'client_flag', int) util.coerce_kw_type(opts, 'local_infile', int) # Note: using either of the below will cause all strings to be diff --git a/test/dialect/mysql/test_dialect.py b/test/dialect/mysql/test_dialect.py index d06b0ddd4..44f786ee0 100644 --- a/test/dialect/mysql/test_dialect.py +++ b/test/dialect/mysql/test_dialect.py @@ -54,6 +54,7 @@ class DialectTest(fixtures.TestBase): ('compress', True), ('connect_timeout', 30), ('read_timeout', 30), + ('write_timeout', 30), ('client_flag', 1234), ('local_infile', 1234), ('use_unicode', False), |