Merge branch 'release-2.0.3' into master-2.0

Author: Geert Vanderkelen

CHANGES.txt

@@ -3,11 +3,21 @@ MySQL Connector/Python 2.0 - Release Notes & Changes
 ====================================================
 
 MySQL Connector/Python
-Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
 
 Full release notes:
  http://dev.mysql.com/doc/relnotes/connector-python/en/
 
+v2.0.3
+======
+
+- BUG19703022: Fix using passwords with integers only in option files
+- BUG19777815: Add support for warnings with MySQLCursor.callproc()
+- BUG19972427: Fix creating of redundant connections in Django
+- BUG19331658: Fix connection pooling with MySQL Fabric
+- BUG19930054: Lost connection to server error during query
+- BUG19803702: Fix reporting errors with non-ascii characters
+
 v2.0.2
 ======
 

README.txt

@@ -3,7 +3,7 @@ MySQL Connector/Python 2.0
 ==========================
 
 MySQL Connector/Python
-Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2009, 2015, Oracle and/or its affiliates. All rights reserved.
 
 License information can be found in the LICENSE.txt file.
 
@@ -28,7 +28,7 @@ doubt, this particular copy of the software is released
 under the version 2 of the GNU General Public License.
 MySQL Connector/Python is brought to you by Oracle.
 
-Copyright (c) 2011, 2014, Oracle and/or its affiliates. All rights reserved.
+Copyright (c) 2011, 2015, Oracle and/or its affiliates. All rights reserved.
 
 License information can be found in the LICENSE.txt file.
 

cpyint

@@ -139,6 +139,9 @@ def connect(*args, **kwargs):
         raise InterfaceError("fabric and failover arguments can not be used")
 
     if 'fabric' in kwargs:
+        if 'pool_name' in kwargs:
+            raise AttributeError("'pool_name' argument is not supported with "
+                                 " MySQL Fabric. Use 'pool_size' instead.")
         from .fabric import connect as fabric_connect
         return fabric_connect(*args, **kwargs)
 

lib/mysql/connector/__init__.py

@@ -66,7 +66,11 @@ def set_unicode(self, value=True):
 
     def to_mysql(self, value):
         """Convert Python data type to MySQL"""
-        return value
+        type_name = value.__class__.__name__.lower()
+        try:
+            return getattr(self, "_{0}_to_mysql".format(type_name))(value)
+        except AttributeError:
+            return value
 
     def to_python(self, vtype, value):
         """Convert MySQL data type to Python"""

lib/mysql/connector/conversion.py

@@ -697,12 +697,14 @@ def callproc(self, procname, args=()):
             call = "CALL {0}({1})".format(procname, ','.join(argnames))
 
             for result in self._connection.cmd_query_iter(call):
+                # pylint: disable=W0212
+                tmp = MySQLCursorBuffered(self._connection._get_self())
+                tmp._handle_result(result)
+                if tmp._warnings is not None:
+                    self._warnings = tmp._warnings
+                # pylint: enable=W0212
                 if 'columns' in result:
-                    # pylint: disable=W0212
-                    tmp = MySQLCursorBuffered(self._connection._get_self())
-                    tmp._handle_result(result)
                     results.append(tmp)
-                    # pylint: enable=W0212
 
             if argnames:
                 select = "SELECT {0}".format(','.join(argtypes))

lib/mysql/connector/cursor.py

@@ -192,7 +192,7 @@ def __init__(self, connection):
         self.supports_microsecond_precision = self._microseconds_precision()
 
     def _microseconds_precision(self):
-        if self.connection.server_version >= (5, 6, 3):
+        if self.connection.mysql_version >= (5, 6, 3):
             return True
         return False
 
@@ -212,7 +212,7 @@ def _mysql_storage_engine(self):
             cursor.execute(droptable)
             cursor.execute('CREATE TABLE {table} (X INT)'.format(table=tblname))
 
-            if self.connection.server_version >= (5, 0, 0):
+            if self.connection.mysql_version >= (5, 0, 0):
                 cursor.execute(
                     "SELECT ENGINE FROM INFORMATION_SCHEMA.TABLES "
                     "WHERE TABLE_SCHEMA = %s AND TABLE_NAME = %s",
@@ -399,7 +399,7 @@ def sequence_reset_by_name_sql(self, style, sequences):
         # Truncate already resets the AUTO_INCREMENT field from
         # MySQL version 5.0.13 onwards. Refs #16961.
         res = []
-        if self.connection.server_version < (5, 0, 13):
+        if self.connection.mysql_version < (5, 0, 13):
             fmt = "{alter} {table} {{tablename}} {auto_inc} {field};".format(
                 alter=style.SQL_KEYWORD('ALTER'),
                 table=style.SQL_KEYWORD('TABLE'),
@@ -431,13 +431,7 @@ def value_to_db_datetime(self, value):
                     "MySQL backend does not support timezone-aware times."
                 )
 
-        try:
-            # Django 1.6
-            self.connection.ensure_connection()
-        except AttributeError:
-            if not self.connection.connection:
-                self.connection._connect()
-        return self.connection.connection.converter._datetime_to_mysql(value)
+        return self.connection.converter.to_mysql(value)
 
     def value_to_db_time(self, value):
         if value is None:
@@ -448,13 +442,7 @@ def value_to_db_time(self, value):
             raise ValueError("MySQL backend does not support timezone-aware "
                              "times.")
 
-        try:
-            # Django 1.6
-            self.connection.ensure_connection()
-        except AttributeError:
-            if not self.connection.connection:
-                self.connection._connect()
-        return self.connection.connection.converter._time_to_mysql(value)
+        return self.connection.converter.to_mysql(value)
 
     def year_lookup_bounds(self, value):
         # Again, no microseconds
@@ -467,7 +455,7 @@ def year_lookup_bounds_for_datetime_field(self, value):
         # Again, no microseconds
         first, second = super(DatabaseOperations,
             self).year_lookup_bounds_for_datetime_field(value)
-        if self.connection.server_version >= (5, 6, 4):
+        if self.connection.mysql_version >= (5, 6, 4):
             return [first.replace(microsecond=0), second]
         else:
             return [first.replace(microsecond=0),
@@ -522,15 +510,8 @@ class DatabaseWrapper(BaseDatabaseWrapper):
 
     def __init__(self, *args, **kwargs):
         super(DatabaseWrapper, self).__init__(*args, **kwargs)
-        self.server_version = None
-
-        # Since some features depend on the MySQL version, we need to connect
-        try:
-            # Django 1.6
-            self.ensure_connection()
-        except AttributeError:
-            self._connect()
 
+        self.converter = DjangoMySQLConverter()
         self.ops = DatabaseOperations(self)
         self.features = DatabaseFeatures(self)
         self.client = DatabaseClient(self)
@@ -584,14 +565,13 @@ def get_connection_params(self):
     def get_new_connection(self, conn_params):
         # Django 1.6
         cnx = mysql.connector.connect(**conn_params)
-        self.server_version = cnx.get_server_version()
         cnx.set_converter_class(DjangoMySQLConverter)
 
         return cnx
 
     def init_connection_state(self):
         # Django 1.6
-        if self.server_version < (5, 5, 3):
+        if self.mysql_version < (5, 5, 3):
             # See sysvar_sql_auto_is_null in MySQL Reference manual
             self.connection.cmd_query("SET SQL_AUTO_IS_NULL = 0")
 
@@ -737,6 +717,11 @@ def is_usable(self):
         # Django 1.6
         return self.connection.is_connected()
 
-    @property
+    @cached_property
     def mysql_version(self):
-        return self.server_version
+        config = self.get_connection_params()
+        temp_conn = mysql.connector.connect(**config)
+        server_version = temp_conn.get_server_version()
+        temp_conn.close()
+
+        return server_version

lib/mysql/connector/django/base.py

@@ -30,6 +30,7 @@ def __init__(self, connection):
             'IntegerField': 'integer',
             'BigIntegerField': 'bigint',
             'IPAddressField': 'char(15)',
+
             'GenericIPAddressField': 'char(39)',
             'NullBooleanField': 'bool',
             'OneToOneField': 'integer',
@@ -42,7 +43,7 @@ def __init__(self, connection):
         }
 
         # Support for microseconds
-        if self.connection.get_server_version() >= (5, 6, 4):
+        if self.connection.mysql_version >= (5, 6, 4):
             self.data_types.update({
                 'DateTimeField': 'datetime(6)',
                 'TimeField': 'time(6)',

lib/mysql/connector/django/creation.py

@@ -26,6 +26,7 @@
 
 from . import utils
 from .locales import get_client_error
+from .catch23 import PY2
 
 # _CUSTOM_ERROR_EXCEPTIONS holds custom exceptions and is ued by the
 # function custom_error_exception. _ERROR_EXCEPTIONS (at bottom of module)
@@ -187,7 +188,7 @@ def __init__(self, msg=None, errno=None, values=None, sqlstate=None):
         if self.msg and self.errno != -1:
             fields = {
                 'errno': self.errno,
-                'msg': self.msg
+                'msg': self.msg.encode('utf8') if PY2 else self.msg
             }
             if self.sqlstate:
                 fmt = '{errno} ({state}): {msg}'

lib/mysql/connector/errors.py

@@ -61,7 +61,7 @@
         HAVE_SSL = True
 # pylint: enable=F0401,E0611
 
-from ..connection import MySQLConnection
+import mysql.connector
 from ..pooling import MySQLConnectionPool
 from ..errors import (
     Error, InterfaceError, NotSupportedError, MySQLFabricError, InternalError,
@@ -1123,6 +1123,8 @@ def store_config(self, **kwargs):
             del test_config['pool_name']
         if 'pool_size' in test_config:
             del test_config['pool_size']
+        if 'pool_reset_session' in test_config:
+            del test_config['pool_reset_session']
         try:
             pool = MySQLConnectionPool(pool_name=str(uuid.uuid4()))
             pool.set_config(**test_config)
@@ -1186,7 +1188,7 @@ def _connect(self):
             dbconfig['host'] = mysqlserver.host
             dbconfig['port'] = mysqlserver.port
             try:
-                self._mysql_cnx = MySQLConnection(**dbconfig)
+                self._mysql_cnx = mysql.connector.connect(**dbconfig)
             except Error as exc:
                 if counter == attempts:
                     self.reset_cache(mysqlserver.group)

lib/mysql/connector/fabric/connection.py

@@ -220,10 +220,12 @@ def recv_plain(self):
         """Receive packets from the MySQL server"""
         try:
             # Read the header of the MySQL packet, 4 bytes
-            packet = bytearray(4)
-            read = self.sock.recv_into(packet, 4)
-            if read != 4:
-                raise errors.InterfaceError(errno=2013)
+            packet = bytearray(b'')
+            while len(packet) < 4:
+                chunk = self.sock.recv(4)
+                if not chunk:
+                    raise errors.InterfaceError(errno=2013)
+                packet += chunk
 
             # Save the packet number and payload length
             self._packet_number = packet[3]

lib/mysql/connector/network.py

@@ -103,10 +103,14 @@ def read_option_files(**config):
             except KeyError:
                 continue
 
+        not_evaluate = ('password', 'passwd')
         for option, value in config_options.items():
             if option not in config:
                 try:
-                    config[option] = eval(value[0])  # pylint: disable=W0123
+                    if option in not_evaluate:
+                        config[option] = value[0]
+                    else:
+                        config[option] = eval(value[0])  # pylint: disable=W0123
                 except (NameError, SyntaxError):
                     config[option] = value[0]
 

lib/mysql/connector/optionfiles.py

@@ -26,7 +26,7 @@
 as mysql.connector.version.
 """
 
-VERSION = (2, 0, 2, '', 0)
+VERSION = (2, 0, 3, '', 0)
 
 if VERSION[3] and VERSION[4]:
     VERSION_TEXT = '{0}.{1}.{2}{3}{4}'.format(*VERSION)

lib/mysql/connector/version.py

@@ -1,5 +1,6 @@
 
 [client]
+password=12345
 port=1000
 socket=/var/run/mysqld/mysqld.sock
 ssl-ca=dummyCA