Merge "Use MySQL protocol-level ping."

5 files changed, 55 insertions, 1 deletions

diff --git a/doc/build/changelog/migration_13.rst b/doc/build/changelog/migration_13.rst
index 6201435cc..980d12619 100644
--- a/doc/build/changelog/migration_13.rst
+++ b/doc/build/changelog/migration_13.rst
@@ -159,6 +159,18 @@ Dialect Improvements and Changes - PostgreSQL
 Dialect Improvements and Changes - MySQL
 =============================================
 
+.. _change_mysql_ping:
+
+Protocol-level ping now used for pre-ping
+------------------------------------------
+
+The MySQL dialects including mysqlclient, python-mysql, PyMySQL and
+mysql-connector-python now use the ``connection.ping()`` method for the
+pool pre-ping feature, described at :ref:`pool_disconnects_pessimistic`.
+This is a much more lightweight ping than the previous method of emitting
+"SELECT 1" on the connection.
+
+
 Dialect Improvements and Changes - SQLite
 =============================================
 
diff --git a/doc/build/changelog/unreleased_13/mysql_ping.rst b/doc/build/changelog/unreleased_13/mysql_ping.rst
new file mode 100644
index 000000000..daf112549
--- /dev/null
+++ b/doc/build/changelog/unreleased_13/mysql_ping.rst
@@ -0,0 +1,11 @@
+.. change::
+    :tags: feature, mysql
+
+    The "pre-ping" feature of the connection pool now uses
+    the ``ping()`` method of the DBAPI connection in the case of
+    mysqlclient, PyMySQL and mysql-connector-python.  Pull request
+    courtesy Maxim Bublis.
+
+    .. seealso::
+
+        :ref:`change_mysql_ping`
diff --git a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py
index 1ead8aaf5..e16b68bad 100644
--- a/lib/sqlalchemy/dialects/mysql/mysqlconnector.py
+++ b/lib/sqlalchemy/dialects/mysql/mysqlconnector.py
@@ -160,6 +160,17 @@ class MySQLDialect_mysqlconnector(MySQLDialect):
         from mysql import connector
         return connector
 
+    def do_ping(self, dbapi_connection):
+        try:
+            dbapi_connection.ping(False)
+        except self.dbapi.Error as err:
+            if self.is_disconnect(err, dbapi_connection, None):
+                return False
+            else:
+                raise
+        else:
+            return True
+
     def create_connect_args(self, url):
         opts = url.translate_connect_args(username='user')
 
@@ -225,7 +236,8 @@ class MySQLDialect_mysqlconnector(MySQLDialect):
         exceptions = (self.dbapi.OperationalError, self.dbapi.InterfaceError)
         if isinstance(e, exceptions):
             return e.errno in errnos or \
-                "MySQL Connection not available." in str(e)
+                "MySQL Connection not available." in str(e) or \
+                "Connection to MySQL is not available" in str(e)
         else:
             return False
 
diff --git a/lib/sqlalchemy/dialects/mysql/mysqldb.py b/lib/sqlalchemy/dialects/mysql/mysqldb.py
index 535c8ec52..7554d244c 100644
--- a/lib/sqlalchemy/dialects/mysql/mysqldb.py
+++ b/lib/sqlalchemy/dialects/mysql/mysqldb.py
@@ -101,6 +101,17 @@ class MySQLDialect_mysqldb(MySQLDialect):
     def dbapi(cls):
         return __import__('MySQLdb')
 
+    def do_ping(self, dbapi_connection):
+        try:
+            dbapi_connection.ping(False)
+        except self.dbapi.Error as err:
+            if self.is_disconnect(err, dbapi_connection, None):
+                return False
+            else:
+                raise
+        else:
+            return True
+
     def do_executemany(self, cursor, statement, parameters, context=None):
         rowcount = cursor.executemany(statement, parameters)
         if context is not None:
diff --git a/lib/sqlalchemy/dialects/mysql/pymysql.py b/lib/sqlalchemy/dialects/mysql/pymysql.py
index 4f1c792f9..5f176cef2 100644
--- a/lib/sqlalchemy/dialects/mysql/pymysql.py
+++ b/lib/sqlalchemy/dialects/mysql/pymysql.py
@@ -61,6 +61,14 @@ class MySQLDialect_pymysql(MySQLDialect_mysqldb):
     def dbapi(cls):
         return __import__('pymysql')
 
+    def is_disconnect(self, e, connection, cursor):
+        if super(MySQLDialect_pymysql, self).is_disconnect(e, connection, cursor):
+            return True
+        elif isinstance(e, self.dbapi.Error):
+            return "Already closed" in str(e)
+        else:
+            return False
+
     if py3k:
         def _extract_error_code(self, exception):
             if isinstance(exception.args[0], Exception):