- make the google deprecation messages more specific, use full URL

format
- add an extra doc to MySQLdb
- changelog

(cherry picked from commit 182553b7409cfa6673483d03f29bc4c462336577)

diff --git a/doc/build/changelog/changelog_09.rst b/doc/build/changelog/changelog_09.rst
index f92d8324b77589658f57852f811ec8f4c11bd8c4..7505ee50c25010da09077089713f769a0785e3a9 100644 (file)
--- a/doc/build/changelog/changelog_09.rst
+++ b/doc/build/changelog/changelog_09.rst
@@ -13,6 +13,15 @@
 .. changelog::
     :version: 0.9.9
 
+    .. change::
+        :tags: change, mysql
+        :versions: 1.0.0
+        :tickets: 3275
+
+        The ``gaerdbms`` dialect is no longer necessary, and emits a
+        deprecation warning.  Google now recommends using the MySQLdb
+        dialect directly.
+
     .. change::
         :tags: bug, sql
         :versions: 1.0.0

diff --git a/lib/sqlalchemy/dialects/mysql/gaerdbms.py b/lib/sqlalchemy/dialects/mysql/gaerdbms.py
index 947b066cc43dfa836b4d9eaa87ada436b31d597a..b4daec69c14b4a012276ca5e3234da4b7a99485f 100644 (file)
--- 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 77e2912a8766ba20a3bd4ac7e8ca9518ccc014b4..2bab7bc0c12d60af8a9d5926a2491c6174cb903d 100644 (file)
--- 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,