From a06cd94baab114cd0b2fa0987267e31811d38f7a Mon Sep 17 00:00:00 2001 From: Federico Caselli Date: Wed, 11 Jan 2023 20:33:16 +0100 Subject: [PATCH] Move docs in mysql dbapi Fixes: #9084 Change-Id: I5e174c318a20b7fcb5ea7c771293c5102e761ed7 --- lib/sqlalchemy/dialects/mysql/mysqldb.py | 13 ------------- lib/sqlalchemy/dialects/mysql/pymysql.py | 14 +++++++++++++- 2 files changed, 13 insertions(+), 14 deletions(-) diff --git a/lib/sqlalchemy/dialects/mysql/mysqldb.py b/lib/sqlalchemy/dialects/mysql/mysqldb.py index 8cdfd698fb..5c9d11a53d 100644 --- a/lib/sqlalchemy/dialects/mysql/mysqldb.py +++ b/lib/sqlalchemy/dialects/mysql/mysqldb.py @@ -65,19 +65,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 cdd5795443..67ccb17fd8 100644 --- a/lib/sqlalchemy/dialects/mysql/pymysql.py +++ b/lib/sqlalchemy/dialects/mysql/pymysql.py @@ -27,7 +27,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 -- 2.47.2