Merge branch 'release/8.0.26'

Author: nmariz

CHANGES.txt

@@ -11,13 +11,19 @@ Full release notes:
 v8.0.26
 =======
 
+- WL#14634: Running unit tests against external server
 - WL#14542: Deprecate TLS 1.0 and 1.1
 - WL#14440: Support for authentication_kerberos_client authentication plugin
+- WL#14306: Integrate QA tests into Connector/Python test suite
 - WL#14237: Support query attributes
+- BUG#32947160: Remove MySQLdb module dependency from Django backend
+- BUG#32838010: Fix option files parsing with include directive
+- BUG#32789076: MSI is missing required libraries to use auth_ldap_client plugin
 - BUG#32778827: Raise an error if the _id is different when replacing a document
 - BUG#32740486: Fix typo in docstring
 - BUG#32623479: The X DevAPI returns str for binary types values
 - BUG#32585611: Fix broken links in X DevAPI reference documentation search
+- BUG#31528783: Fix number with ZEROFILL not handled by C extension
 
 v8.0.25
 =======

cpydist/bdist_solaris.py

@@ -311,7 +311,8 @@ def run(self):
         sun_root = os.path.join(build_base, "sun_pure")
         cmd_install = self.reinitialize_command("install",
                                                 reinit_subcommands=1)
-        cmd_install.compile = False
+        cmd_install.byte_code_only = self.byte_code_only
+        cmd_install.compile = self.byte_code_only
         cmd_install.distribution.metadata.name = metadata_name
         cmd_install.with_mysql_capi = None
         cmd_install.root = os.path.join(sun_root, self.dstroot)

examples/inserts.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -53,7 +53,7 @@ def main(config):
         "CREATE TABLE names ("
         "    id TINYINT UNSIGNED NOT NULL AUTO_INCREMENT, "
         "    name VARCHAR(30) DEFAULT '' NOT NULL, "
-        "    info TEXT DEFAULT '', "
+        "    info TEXT, "
         "    age TINYINT UNSIGNED DEFAULT '30', "
         "PRIMARY KEY (id))"
     )

examples/multi_resultsets.py

@@ -1,7 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 
-# Copyright (c) 2009, 2017, Oracle and/or its affiliates. All rights reserved.
+# Copyright (c) 2009, 2021, Oracle and/or its affiliates. All rights reserved.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -52,7 +52,7 @@ def main(config):
         "CREATE TABLE names ("
         "    id TINYINT UNSIGNED NOT NULL AUTO_INCREMENT, "
         "    name VARCHAR(30) DEFAULT '' NOT NULL, "
-        "    info TEXT DEFAULT '', "
+        "    info TEXT, "
         "    age TINYINT UNSIGNED DEFAULT '30', "
         "    PRIMARY KEY (id))"
     )

lib/mysql/connector/django/base.py

@@ -48,7 +48,6 @@
 from django.core.exceptions import ImproperlyConfigured
 from django.db import IntegrityError
 from django.db.backends.base.base import BaseDatabaseWrapper
-from django.db.backends.mysql.base import DatabaseWrapper as MySQLDatabaseWrapper
 from django.db import utils
 from django.utils.functional import cached_property
 from django.utils import dateparse, timezone
@@ -175,7 +174,7 @@ def __iter__(self):
         return iter(self.cursor)
 
 
-class DatabaseWrapper(MySQLDatabaseWrapper):
+class DatabaseWrapper(BaseDatabaseWrapper):
     vendor = 'mysql'
     # This dictionary maps Field objects to their associated MySQL column
     # types, as strings. Column-type strings can contain format strings; they'll
@@ -456,6 +455,30 @@ def data_type_check_constraints(self):
             return check_constraints
         return {}
 
+    @cached_property
+    def mysql_server_data(self):
+        with self.temporary_connection() as cursor:
+            # Select some server variables and test if the time zone
+            # definitions are installed. CONVERT_TZ returns NULL if 'UTC'
+            # timezone isn't loaded into the mysql.time_zone table.
+            cursor.execute("""
+                SELECT VERSION(),
+                       @@sql_mode,
+                       @@default_storage_engine,
+                       @@sql_auto_is_null,
+                       @@lower_case_table_names,
+                       CONVERT_TZ('2001-01-01 01:00:00', 'UTC', 'UTC') IS NOT NULL
+            """)
+            row = cursor.fetchone()
+        return {
+            'version': row[0],
+            'sql_mode': row[1],
+            'default_storage_engine': row[2],
+            'sql_auto_is_null': bool(row[3]),
+            'lower_case_table_names': bool(row[4]),
+            'has_zoneinfo_database': bool(row[5]),
+        }
+
     @cached_property
     def mysql_server_info(self):
         with self.temporary_connection() as cursor:
@@ -479,7 +502,6 @@ def sql_mode(self):
     @property
     def use_pure(self):
         return self._use_pure
-        # return not HAVE_CEXT or self._use_pure
 
 
 class DjangoMySQLConverter(MySQLConverter):

lib/mysql/connector/django/introspection.py

@@ -36,9 +36,6 @@
 from django.db.backends.base.introspection import (
     BaseDatabaseIntrospection, FieldInfo as BaseFieldInfo, TableInfo,
 )
-from django.db.backends.mysql.introspection import (
-    DatabaseIntrospection as MySQLDatabaseIntrospection,
-)
 from django.db.models import Index
 from django.utils.datastructures import OrderedSet
 
@@ -60,7 +57,57 @@
     )
 
 
-class DatabaseIntrospection(MySQLDatabaseIntrospection):
+class DatabaseIntrospection(BaseDatabaseIntrospection):
+
+    data_types_reverse = {
+        FieldType.BLOB: 'TextField',
+        FieldType.DECIMAL: 'DecimalField',
+        FieldType.NEWDECIMAL: 'DecimalField',
+        FieldType.DATE: 'DateField',
+        FieldType.DATETIME: 'DateTimeField',
+        FieldType.DOUBLE: 'FloatField',
+        FieldType.FLOAT: 'FloatField',
+        FieldType.INT24: 'IntegerField',
+        FieldType.LONG: 'IntegerField',
+        FieldType.LONGLONG: 'BigIntegerField',
+        FieldType.SHORT: 'SmallIntegerField',
+        FieldType.STRING: 'CharField',
+        FieldType.TIME: 'TimeField',
+        FieldType.TIMESTAMP: 'DateTimeField',
+        FieldType.TINY: 'IntegerField',
+        FieldType.TINY_BLOB: 'TextField',
+        FieldType.MEDIUM_BLOB: 'TextField',
+        FieldType.LONG_BLOB: 'TextField',
+        FieldType.VAR_STRING: 'CharField',
+    }
+
+    def get_field_type(self, data_type, description):
+        field_type = super().get_field_type(data_type, description)
+        if 'auto_increment' in description.extra:
+            if field_type == 'IntegerField':
+                return 'AutoField'
+            elif field_type == 'BigIntegerField':
+                return 'BigAutoField'
+            elif field_type == 'SmallIntegerField':
+                return 'SmallAutoField'
+        if description.is_unsigned:
+            if field_type == 'BigIntegerField':
+                return 'PositiveBigIntegerField'
+            elif field_type == 'IntegerField':
+                return 'PositiveIntegerField'
+            elif field_type == 'SmallIntegerField':
+                return 'PositiveSmallIntegerField'
+        # JSON data type is an alias for LONGTEXT in MariaDB, use check
+        # constraints clauses to introspect JSONField.
+        if description.has_json_constraint:
+            return 'JSONField'
+        return field_type
+
+    def get_table_list(self, cursor):
+        """Return a list of table and view names in the current database."""
+        cursor.execute("SHOW FULL TABLES")
+        return [TableInfo(row[0], {'BASE TABLE': 't', 'VIEW': 'v'}.get(row[1]))
+                for row in cursor.fetchall()]
 
     def get_table_description(self, cursor, table_name):
         """
@@ -181,6 +228,54 @@ def get_primary_key_column(self, cursor, table_name):
                 return column[0]
         return None
 
+    def get_sequences(self, cursor, table_name, table_fields=()):
+        for field_info in self.get_table_description(cursor, table_name):
+            if 'auto_increment' in field_info.extra:
+                # MySQL allows only one auto-increment column per table.
+                return [{'table': table_name, 'column': field_info.name}]
+        return []
+
+    def get_relations(self, cursor, table_name):
+        """
+        Return a dictionary of {field_name: (field_name_other_table, other_table)}
+        representing all relationships to the given table.
+        """
+        constraints = self.get_key_columns(cursor, table_name)
+        relations = {}
+        for my_fieldname, other_table, other_field in constraints:
+            relations[my_fieldname] = (other_field, other_table)
+        return relations
+
+    def get_key_columns(self, cursor, table_name):
+        """
+        Return a list of (column_name, referenced_table_name, referenced_column_name)
+        for all key columns in the given table.
+        """
+        key_columns = []
+        cursor.execute("""
+            SELECT column_name, referenced_table_name, referenced_column_name
+            FROM information_schema.key_column_usage
+            WHERE table_name = %s
+                AND table_schema = DATABASE()
+                AND referenced_table_name IS NOT NULL
+                AND referenced_column_name IS NOT NULL""", [table_name])
+        key_columns.extend(cursor.fetchall())
+        return key_columns
+
+    def get_storage_engine(self, cursor, table_name):
+        """
+        Retrieve the storage engine for a given table. Return the default
+        storage engine if the table doesn't exist.
+        """
+        cursor.execute(
+            "SELECT engine "
+            "FROM information_schema.tables "
+            "WHERE table_name = %s", [table_name])
+        result = cursor.fetchone()
+        if not result:
+            return self.connection.features._mysql_storage_engine
+        return result[0]
+
     def get_constraints(self, cursor, table_name):
         """
         Retrieve any constraints or keys (unique, pk, fk, check, index) across

lib/mysql/connector/optionfiles.py

@@ -1,4 +1,4 @@
-# Copyright (c) 2014, 2020, Oracle and/or its affiliates.
+# Copyright (c) 2014, 2021, Oracle and/or its affiliates.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License, version 2.0, as
@@ -166,12 +166,14 @@ def _parse_options(self, files):
         Raises ValueError if any of the included or file given in arguments
         is not readable.
         """
+        initial_files = files[:]
+        files = []
         index = 0
         err_msg = "Option file '{0}' being included again in file '{1}'"
 
-        for file_ in files:
+        for file_ in initial_files:
             try:
-                if file_ in files[index+1:]:
+                if file_ in initial_files[index+1:]:
                     raise ValueError("Same option file '{0}' occurring more "
                                      "than once in the list".format(file_))
                 with open(file_, 'r') as op_file:
@@ -186,18 +188,18 @@ def _parse_options(self, files):
                                         entry, file_))
                                 if (os.path.isfile(entry) and
                                         entry.endswith(self.default_extension)):
-                                    files.insert(index+1, entry)
+                                    files.append(entry)
 
                         elif line.startswith('!include'):
                             _, filename = line.split(None, 1)
                             filename = filename.strip()
                             if filename in files:
                                 raise ValueError(err_msg.format(
                                     filename, file_))
-                            files.insert(index+1, filename)
+                            files.append(filename)
 
                     index += 1
-
+                    files.append(file_)
             except (IOError, OSError) as exc:
                 raise ValueError("Failed reading file '{0}': {1}".format(
                     file_, str(exc)))
@@ -224,6 +226,10 @@ def read(self, filenames):  # pylint: disable=W0221
                 out_file = io.StringIO()
                 for line in codecs.open(filename, encoding='utf-8'):
                     line = line.strip()
+                    # Skip lines that begin with "!includedir" or "!include"
+                    if line.startswith('!include'):
+                        continue
+
                     match_obj = self.OPTCRE.match(line)
                     if not self.SECTCRE.match(line) and match_obj:
                         optname, delimiter, optval = match_obj.group('option',

src/mysql_capi.c

@@ -2669,7 +2669,13 @@ MySQL_fetch_row(MySQL *self)
             field_type == MYSQL_TYPE_LONGLONG ||
             field_type == MYSQL_TYPE_INT24 ||
             field_type == MYSQL_TYPE_YEAR) {
-    		PyTuple_SET_ITEM(result_row, i, PyLong_FromString(row[i], NULL, 0));
+            if (field_flags && ZEROFILL_FLAG) {
+                PyTuple_SET_ITEM(result_row, i, PyLong_FromString(row[i], NULL, 10));
+            }
+            else
+            {
+                PyTuple_SET_ITEM(result_row, i, PyLong_FromString(row[i], NULL, 0));
+            }
         }
         else if (field_type == MYSQL_TYPE_DATETIME ||
                  field_type == MYSQL_TYPE_TIMESTAMP)