Merge Release-2.0.0

Author: Geert Vanderkelen

CHANGES.txt

@@ -1,19 +1,26 @@
-================================================
-MySQL Connector/Python - Release Notes & Changes
-================================================
+====================================================
+MySQL Connector/Python 2.0 - Release Notes & Changes
+====================================================
 
 MySQL Connector/Python
 Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
 
 Full release notes:
  http://dev.mysql.com/doc/relnotes/connector-python/en/
 
-
 v2.0.0a1
 ========
 
-Released on (not yet released)
-
-* (features + bug fixes)
-
+- BUG19207922: Fix fetching multiple results when executing procedure
+- BUG19184025: Fix results containing NULL
+- BUG19169990: Fix sending/receiving using compressed connection
+- BUG18956789: Fix Django TimeField 00:00:00 converting to MySQL NULL
+- WL7228: Allow Connector/Python to use MySQL option files
+- BUG18843153: Fix Django to check connection on each request
+- WL7937: Allow LOAD DATA LOCAL INFILE by default
+- BUG18742429: Fix prepared statements returning lots of columns
+- BUG18814880: Fix stopping mysqld running unit tests on Windows
+- WL7292: Add cursors returning dict and namedtuple as rows
+- WL7462: Consolidate Python v2 and v3 code
+- WL7716: Move commercial files and distribution to CPYINT
 

MANIFEST.in

@@ -3,24 +3,12 @@ include LICENSE.txt
 include CHANGES.txt
 include setup.py
 include setupinfo.py
-include version.py
 include unittests.py
 include MANIFEST.in
 
-include python2/__init__.py
-recursive-include python2/examples *.py
-recursive-include python2/mysql *.py
-
-include python3/__init__.py
-recursive-include python3/mysql *.py
-recursive-include python3/examples *.py
-
-include python23/__init__.py
-recursive-include python23/django *.py
-recursive-include python23/fabric *.py
-recursive-include python23/tests23 *.py
-
-recursive-include tests *.py *.csv pylint*.rc *.pem
+recursive-include examples *.py
+recursive-include lib *.py
+recursive-include tests *.py *.csv *.pem *.cnf
 
 include docs/README_DOCS.txt
 

README.txt

@@ -2,6 +2,23 @@
 MySQL Connector/Python 2.0
 ==========================
 
+MySQL Connector/Python
+Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
+
+License information can be found in the LICENSE.txt file.
+
+
+Documentation & Examples
+========================
+
+Documentation for all Connector/Python versions can be found online here:
+
+ http://dev.mysql.com/doc/connector-python/en/index.html
+
+The source distribution of Connector/Python also contains example scripts.
+They can be found in the examples/ directory.
+
+
 License
 =======
 

lib/mysql/connector/connection.py

@@ -159,7 +159,12 @@ def _do_handshake(self):
             raise errors.InterfaceError("Failed parsing MySQL version")
 
         version = tuple([int(v) for v in match.groups()[0:3]])
-        if version < (4, 1):
+        if b'fabric' in match.group(4).lower():
+            if version < (1, 4):
+                raise errors.InterfaceError(
+                    "MySQL Fabric '{0}'' is not supported".format(
+                        handshake['server_version_original']))
+        elif version < (4, 1):
             raise errors.InterfaceError(
                 "MySQL Version '{0}' is not supported.".format(
                     handshake['server_version_original']))

lib/mysql/connector/conversion.py

@@ -188,6 +188,10 @@ def _bytes_to_mysql(self, value):
         """Convert value to bytes"""
         return value
 
+    def _bytearray_to_mysql(self, value):
+        """Convert value to bytes"""
+        return str(value)
+
     def _bool_to_mysql(self, value):
         """Convert value to boolean"""
         if value:
@@ -373,7 +377,8 @@ def row_to_python(self, row, fields):
             field_type = field[1]
 
             if (row[i] == 0 and field_type != FieldType.BIT) or row[i] is None:
-                # Don't go further when we hit a NULL value
+                # Don't convert NULL value
+                i += 1
                 continue
 
             try:
@@ -385,7 +390,7 @@ def row_to_python(self, row, fields):
                 except UnicodeDecodeError:
                     result[i] = row[i]
             except (ValueError, TypeError) as err:
-                err.message = "{0} (field {1})".format(err.message, field[0])
+                err.message = "{0} (field {1})".format(str(err), field[0])
                 raise
 
             i += 1

lib/mysql/connector/cursor.py

@@ -434,14 +434,19 @@ def _execute_iter(self, query_iter):
         given query_iter (result of MySQLConnection.cmd_query_iter()) and
         the list of statements that were executed.
         """
-        if not self._executed_list:
-            self._executed_list = RE_SQL_SPLIT_STMTS.split(self._executed)
+        executed_list = RE_SQL_SPLIT_STMTS.split(self._executed)
 
-        for stmt in self._executed_list:
+        i = 0
+        while True:
             result = next(query_iter)
             self._reset_result()
             self._handle_result(result)
-            self._executed = stmt
+            try:
+                self._executed = executed_list[i].strip()
+                i += 1
+            except IndexError:
+                self._executed = executed_list[0]
+
             yield self
 
     def execute(self, operation, params=None, multi=False):

lib/mysql/connector/dbapi.py

@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright (c) 2009, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2014, Oracle and/or its affiliates. All rights reserved.
 
 # MySQL Connector/Python is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most

lib/mysql/connector/fabric/connection.py

@@ -31,6 +31,7 @@
 from hashlib import md5
 import logging
 import socket
+import collections
 
 # pylint: disable=F0401,E0611
 try:
@@ -135,6 +136,64 @@
 
 _LOGGER = logging.getLogger('myconnpy-fabric')
 
+class FabricResponse(object):
+    """Class used to parse a response got from Fabric.
+    """
+
+    SUPPORTED_VERSION = 1
+
+    def __init__(self, data):
+        """Initialize the FabricResponse object
+        """
+        (format_version, fabric_uuid_str, ttl, error, rows) = data
+        if error:
+            raise InterfaceError(error)
+        if format_version != FabricResponse.SUPPORTED_VERSION:
+            raise InterfaceError(
+                "Supported protocol has version {sversion}. Got a response "
+                "from MySQL Fabric with version {gversion}.".format(
+                    sversion=FabricResponse.SUPPORTED_VERSION,
+                    gversion=format_version)
+            )
+        self.format_version = format_version
+        self.fabric_uuid_str = fabric_uuid_str
+        self.ttl = ttl
+        self.coded_rows = rows
+
+class FabricSet(FabricResponse):
+    """Iterator to navigate through the result set returned from Fabric
+    """
+    def __init__(self, data):
+        """Initialize the FabricSet object.
+        """
+        super(FabricSet, self).__init__(data)
+        assert len(self.coded_rows) == 1
+        self.__names = self.coded_rows[0]['info']['names']
+        self.__rows = self.coded_rows[0]['rows']
+        assert all(len(self.__names) == len(row) for row in self.__rows) or \
+               len(self.__rows) == 0
+        self.__result = collections.namedtuple('ResultSet', self.__names)
+
+    def rowcount(self):
+        """The number of rows in the result set.
+        """
+        return len(self.__rows)
+
+    def rows(self):
+        """Iterate over the rows of the result set.
+
+        Each row is a named tuple.
+        """
+        for row in self.__rows:
+            yield self.__result(*row)
+
+    def row(self, index):
+        """Indexing method for a row.
+
+        Each row is a named tuple.
+        """
+        return self.__result(*self.__rows[index])
+
 
 def extra_failure_report(error_codes):
     """Add MySQL error to be reported to Fabric
@@ -448,8 +507,10 @@ def report_failure(self, server_uuid, errno):
                           server_uuid)
             inst = self.get_instance()
             try:
-                inst.proxy.threat.report_failure(server_uuid, current_host,
-                                                 errno)
+                data = inst.proxy.threat.report_failure(
+                    server_uuid, current_host, errno
+                )
+                FabricResponse(data)
             except (Fault, socket.error) as exc:
                 _LOGGER.debug("Failed reporting server to Fabric (%s)",
                               str(exc))
@@ -473,15 +534,10 @@ def get_fabric_servers(self, fabric_cnx=None):
         result = []
         err_msg = "Looking up Fabric servers failed using {host}:{port}: {err}"
         try:
-            (fabric_uuid_str, fabric_version, ttl, addr_list) = \
-                inst.proxy.dump.fabric_nodes()
-            for addr in addr_list:
-                try:
-                    host, port = addr.split(':', 2)
-                    port = int(port)
-                except ValueError:
-                    host, port = addr, MYSQL_FABRIC_PORT
-                result.append({'host': host, 'port': port})
+            data = inst.proxy.dump.fabric_nodes('protocol.xmlrpc')
+            fset = FabricSet(data)
+            for row in fset.rows():
+                result.append({'host': row.host, 'port': row.port})
         except (Fault, socket.error) as exc:
             msg = err_msg.format(err=str(exc), host=inst.host, port=inst.port)
             raise InterfaceError(msg)
@@ -492,11 +548,13 @@ def get_fabric_servers(self, fabric_cnx=None):
             raise InterfaceError(msg)
 
         try:
-            fabric_uuid = uuid.UUID('{' + fabric_uuid_str + '}')
+            fabric_uuid = uuid.UUID(fset.fabric_uuid_str)
         except TypeError:
             fabric_uuid = uuid.uuid4()
 
-        return fabric_uuid, fabric_version, ttl, result
+        fabric_version = 0
+
+        return fabric_uuid, fabric_version, fset.ttl, result
 
     def get_group_servers(self, group, use_cache=True):
         """Get all MySQL servers in a group
@@ -519,19 +577,21 @@ def get_group_servers(self, group, use_cache=True):
         inst = self.get_instance()
         result = []
         try:
-            servers = inst.proxy.dump.servers(
-                self._version_token, group)[3]
+            data = inst.proxy.dump.servers(self._version_token, group)
+            fset = FabricSet(data)
         except (Fault, socket.error) as exc:
             msg = ("Looking up MySQL servers failed for group "
                    "{group}: {error}").format(error=str(exc), group=group)
             raise InterfaceError(msg)
 
         weights = []
-        for server in servers:
+        for row in fset.rows():
             # We make sure, when using local groups, we skip the global group
-            if server[1] == group:
-                server[3] = int(server[3])  # port should be an int
-                mysqlserver = FabricMySQLServer(*server)
+            if row.group_id == group:
+                mysqlserver = FabricMySQLServer(
+                    row.server_uuid, row.group_id, row.host, row.port,
+                    row.mode, row.status, row.weight
+                )
                 result.append(mysqlserver)
                 if mysqlserver.status == STATUS_SECONDARY:
                     weights.append((mysqlserver.uuid, mysqlserver.weight))
@@ -639,17 +699,22 @@ def get_sharding_information(self, tables=None, database=None):
             patterns.append("{0}.{1}".format(dbase, tbl))
 
         inst = self.get_instance()
-
         try:
-            result = inst.proxy.dump.sharding_information(
-                self._version_token, ','.join(patterns))
+            data = inst.proxy.dump.sharding_information(
+                self._version_token, ','.join(patterns)
+            )
+            fset = FabricSet(data)
         except (Fault, socket.error) as exc:
             msg = "Looking up sharding information failed : {error}".format(
                 error=str(exc))
             raise InterfaceError(msg)
 
-        for info in result[3]:
-            self._cache.sharding_cache_table(FabricShard(*info))
+        for row in fset.rows():
+            self._cache.sharding_cache_table(
+                FabricShard(row.schema_name, row.table_name, row.column_name,
+                            row.lower_bound, row.shard_id, row.type_name,
+                            row.group_id, row.global_group)
+            )
 
     def get_shard_server(self, tables, key, scope=SCOPE_LOCAL, mode=None):
         """Get MySQL server information for a particular shard

lib/mysql/connector/locales/eng/__init__.py

@@ -1,5 +1,5 @@
 # MySQL Connector/Python - MySQL driver written in Python.
-# Copyright (c) 2012, 2013, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2012, 2014, Oracle and/or its affiliates. All rights reserved.
 
 # MySQL Connector/Python is licensed under the terms of the GPLv2
 # <http://www.gnu.org/licenses/old-licenses/gpl-2.0.html>, like most