diff options
| author | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-05-08 17:55:28 -0400 |
|---|---|---|
| committer | Mike Bayer <mike_mp@zzzcomputing.com> | 2017-05-08 17:55:28 -0400 |
| commit | a2e7b4c5fa71b95829e6d954f958bd91b4fd67e5 (patch) | |
| tree | 239c29934edaadf7bda94eaf976a1e91d1dcf512 | |
| parent | 735c0f8414185934589c56613f61108bd9a99558 (diff) | |
| parent | 3d19fb6d53c2aa0fdb7944569fa697c75785634c (diff) | |
| download | sqlalchemy-a2e7b4c5fa71b95829e6d954f958bd91b4fd67e5.tar.gz | |
Merge branch 'master' of https://github.com/aflyhorse/sqlalchemy
| -rw-r--r-- | lib/sqlalchemy/dialects/mysql/base.py | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/lib/sqlalchemy/dialects/mysql/base.py b/lib/sqlalchemy/dialects/mysql/base.py index dc7e3b369..21d325d0c 100644 --- a/lib/sqlalchemy/dialects/mysql/base.py +++ b/lib/sqlalchemy/dialects/mysql/base.py @@ -205,8 +205,8 @@ Most MySQL DBAPIs offer the option to set the client character set for a connection. This is typically delivered using the ``charset`` parameter in the URL, such as:: - e = create_engine("mysql+pymysql://scott:tiger@localhost/\ -test?charset=utf8") + e = create_engine( + "mysql+pymysql://scott:tiger@localhost/test?charset=utf8") This charset is the **client character set** for the connection. Some MySQL DBAPIs will default this to a value such as ``latin1``, and some @@ -224,8 +224,8 @@ that includes codepoints more than three bytes in size, this new charset is preferred, if supported by both the database as well as the client DBAPI, as in:: - e = create_engine("mysql+pymysql://scott:tiger@localhost/\ -test?charset=utf8mb4") + e = create_engine( + "mysql+pymysql://scott:tiger@localhost/test?charset=utf8mb4") At the moment, up-to-date versions of MySQLdb and PyMySQL support the ``utf8mb4`` charset. Other DBAPIs such as MySQL-Connector and OurSQL @@ -237,8 +237,8 @@ the MySQL schema and/or server configuration may be required. .. seealso:: `The utf8mb4 Character Set \ -<http://dev.mysql.com/doc/refman/5.5/en/charset-unicode-utf8mb4.html>`_ - \ -in the MySQL documentation + <http://dev.mysql.com/doc/refman/5.5/en/charset-unicode-utf8mb4.html>`_ - \ + in the MySQL documentation Unicode Encoding / Decoding ~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -259,7 +259,8 @@ DBAPI's handling of unicode, such that it instead will return data of the ``str`` type or ``bytes`` type, with data in the configured charset:: # connect while disabling the DBAPI's unicode encoding/decoding - e = create_engine("mysql+mysqldb://scott:tiger@localhost/test?charset=utf8&use_unicode=0") + e = create_engine( + "mysql+mysqldb://scott:tiger@localhost/test?charset=utf8&use_unicode=0") Current recommendations for modern DBAPIs are as follows: @@ -408,7 +409,8 @@ storage engine. .. seealso:: - `CREATE INDEX <http://dev.mysql.com/doc/refman/5.0/en/create-index.html>`_ - MySQL documentation + `CREATE INDEX <http://dev.mysql.com/doc/refman/5.0/en/create-index.html>`_ - \ + MySQL documentation Index Types ~~~~~~~~~~~~~ @@ -2105,4 +2107,3 @@ class _DecodingRowProxy(object): return item.decode(self.charset) else: return item - |