summaryrefslogtreecommitdiff
path: root/lib/sqlalchemy/dialects
diff options
context:
space:
mode:
Diffstat (limited to 'lib/sqlalchemy/dialects')
-rw-r--r--lib/sqlalchemy/dialects/mysql/gaerdbms.py11
-rw-r--r--lib/sqlalchemy/dialects/mysql/mysqldb.py8
2 files changed, 15 insertions, 4 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/gaerdbms.py b/lib/sqlalchemy/dialects/mysql/gaerdbms.py
index 947b066cc..b4daec69c 100644
--- a/lib/sqlalchemy/dialects/mysql/gaerdbms.py
+++ b/lib/sqlalchemy/dialects/mysql/gaerdbms.py
@@ -17,9 +17,12 @@ developers-guide
.. versionadded:: 0.7.8
- .. deprecated:: 1.0 Cloud SQL now recommends creating connections via the
+ .. deprecated:: 1.0 This dialect is **no longer necessary** for
+ Google Cloud SQL; the MySQLdb dialect can be used directly.
+ Cloud SQL now recommends creating connections via the
mysql dialect using the URL format
- `mysql://root@/<dbname>?unix_socket=/cloudsql/<projectid>:<instancename>`
+
+ `mysql+mysqldb://root@/<dbname>?unix_socket=/cloudsql/<projectid>:<instancename>`
Pooling
@@ -42,8 +45,8 @@ from sqlalchemy.util import warn_deprecated
warn_deprecated(
"Google Cloud SQL now recommends creating connections via the "
- "mysql dialect using the URL format "
- "mysql://root@/<dbname>?unix_socket=/cloudsql/<projectid>:<instancename>"
+ "MySQLdb dialect directly, using the URL format "
+ "mysql+mysqldb://root@/<dbname>?unix_socket=/cloudsql/<projectid>:<instancename>"
)
diff --git a/lib/sqlalchemy/dialects/mysql/mysqldb.py b/lib/sqlalchemy/dialects/mysql/mysqldb.py
index 5bb67a24d..929317467 100644
--- a/lib/sqlalchemy/dialects/mysql/mysqldb.py
+++ b/lib/sqlalchemy/dialects/mysql/mysqldb.py
@@ -39,6 +39,14 @@ MySQL-python version 1.2.2 has a serious memory leak related
to unicode conversion, a feature which is disabled via ``use_unicode=0``.
It is strongly advised to use the latest version of MySQL-Python.
+Using MySQLdb with Google Cloud SQL
+-----------------------------------
+
+Google Cloud SQL now recommends use of the MySQLdb dialect. Connect
+using a URL like the following::
+
+ mysql+mysqldb://root@/<dbname>?unix_socket=/cloudsql/<projectid>:<instancename>
+
"""
from .base import (MySQLDialect, MySQLExecutionContext,