From: Federico Caselli Date: Wed, 11 Jan 2023 19:33:16 +0000 (+0100) Subject: Move docs in mysql dbapi X-Git-Tag: rel_1_4_47~22 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ae57d5b7b4ee0d5bf3b15f91f86236eb16120b0f;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git Move docs in mysql dbapi Fixes: #9084 Change-Id: I5e174c318a20b7fcb5ea7c771293c5102e761ed7 (cherry picked from commit a06cd94baab114cd0b2fa0987267e31811d38f7a) --- diff --git a/lib/sqlalchemy/dialects/mysql/mysqldb.py b/lib/sqlalchemy/dialects/mysql/mysqldb.py index 9e31f4ba2a..7eef518549 100644 --- a/lib/sqlalchemy/dialects/mysql/mysqldb.py +++ b/lib/sqlalchemy/dialects/mysql/mysqldb.py @@ -63,19 +63,6 @@ where they will be interpreted into the "ssl" dictionary automatically: "&ssl_key=/home/gord/client-ssl/client-key.pem" ) -If the server uses an automatically-generated certificate that is self-signed -or does not match the host name (as seen from the client), it may also be -necessary to indicate ``ssl_check_hostname=false``:: - - connection_uri = ( - "mysql+pymysql://scott:tiger@192.168.0.134/test" - "?ssl_ca=/home/gord/client-ssl/ca.pem" - "&ssl_cert=/home/gord/client-ssl/client-cert.pem" - "&ssl_key=/home/gord/client-ssl/client-key.pem" - "&ssl_check_hostname=false" - ) - - .. seealso:: :ref:`pymysql_ssl` in the PyMySQL dialect diff --git a/lib/sqlalchemy/dialects/mysql/pymysql.py b/lib/sqlalchemy/dialects/mysql/pymysql.py index 5e234fbec1..3a776f8775 100644 --- a/lib/sqlalchemy/dialects/mysql/pymysql.py +++ b/lib/sqlalchemy/dialects/mysql/pymysql.py @@ -25,7 +25,19 @@ SSL Connections ------------------ The PyMySQL DBAPI accepts the same SSL arguments as that of MySQLdb, -described at :ref:`mysqldb_ssl`. See that section for examples. +described at :ref:`mysqldb_ssl`. See that section for additional examples. + +If the server uses an automatically-generated certificate that is self-signed +or does not match the host name (as seen from the client), it may also be +necessary to indicate ``ssl_check_hostname=false`` in PyMySQL:: + + connection_uri = ( + "mysql+pymysql://scott:tiger@192.168.0.134/test" + "?ssl_ca=/home/gord/client-ssl/ca.pem" + "&ssl_cert=/home/gord/client-ssl/client-cert.pem" + "&ssl_key=/home/gord/client-ssl/client-key.pem" + "&ssl_check_hostname=false" + ) MySQL-Python Compatibility