Fix MyPy & black errors

dbt/adapters/mariadb/connections.py

@@ -10,7 +10,7 @@
 from dbt.contracts.connection import Credentials
 from dbt.events import AdapterLogger
 from dataclasses import dataclass
-from typing import Optional
+from typing import Optional, Union
 
 logger = AdapterLogger("mysql")
 
@@ -176,7 +176,7 @@ def get_response(cls, cursor) -> AdapterResponse:
         )
 
     @classmethod
-    def data_type_code_to_name(cls, type_code: int) -> str:
+    def data_type_code_to_name(cls, type_code: Union[int, str]) -> str:
         field_type_values = mysql.connector.constants.FieldType.desc.values()
         mapping = {code: name for (code, name) in field_type_values}
         return mapping[type_code]

dbt/adapters/mariadb/impl.py

@@ -168,8 +168,7 @@ def _get_one_catalog(
         for relation in self.list_relations(database, schema):
             logger.debug("Getting table schema for relation {}", str(relation))
             columns.extend(self._get_columns_for_catalog(relation))  # type: ignore[arg-type]
-        return agate.Table.from_object(columns,
-                                       column_types=DEFAULT_TYPE_TESTER)
+        return agate.Table.from_object(columns, column_types=DEFAULT_TYPE_TESTER)
 
     def check_schema_exists(self, database, schema):
         results = self.execute_macro(LIST_SCHEMAS_MACRO_NAME, kwargs={"database": database})

dbt/adapters/mysql/connections.py

@@ -10,7 +10,7 @@
 from dbt.contracts.connection import Credentials
 from dbt.events import AdapterLogger
 from dataclasses import dataclass
-from typing import Optional
+from typing import Optional, Union
 
 logger = AdapterLogger("mysql")
 
@@ -172,7 +172,7 @@ def get_response(cls, cursor) -> AdapterResponse:
         )
 
     @classmethod
-    def data_type_code_to_name(cls, type_code: int) -> str:
+    def data_type_code_to_name(cls, type_code: Union[int, str]) -> str:
         field_type_values = mysql.connector.constants.FieldType.desc.values()
         mapping = {code: name for (code, name) in field_type_values}
         return mapping[type_code]

dbt/adapters/mysql/impl.py

@@ -168,8 +168,7 @@ def _get_one_catalog(
         for relation in self.list_relations(database, schema):
             logger.debug("Getting table schema for relation {}", str(relation))
             columns.extend(self._get_columns_for_catalog(relation))  # type: ignore[arg-type]
-        return agate.Table.from_object(columns,
-                                       column_types=DEFAULT_TYPE_TESTER)
+        return agate.Table.from_object(columns, column_types=DEFAULT_TYPE_TESTER)
 
     def check_schema_exists(self, database, schema):
         results = self.execute_macro(LIST_SCHEMAS_MACRO_NAME, kwargs={"database": database})

dbt/adapters/mysql5/connections.py

@@ -10,7 +10,7 @@
 from dbt.contracts.connection import Credentials
 from dbt.events import AdapterLogger
 from dataclasses import dataclass
-from typing import Optional
+from typing import Optional, Union
 
 logger = AdapterLogger("mysql")
 
@@ -176,7 +176,7 @@ def get_response(cls, cursor) -> AdapterResponse:
         )
 
     @classmethod
-    def data_type_code_to_name(cls, type_code: int) -> str:
+    def data_type_code_to_name(cls, type_code: Union[int, str]) -> str:
         field_type_values = mysql.connector.constants.FieldType.desc.values()
         mapping = {code: name for (code, name) in field_type_values}
         return mapping[type_code]

dbt/adapters/mysql5/impl.py

@@ -168,8 +168,7 @@ def _get_one_catalog(
         for relation in self.list_relations(database, schema):
             logger.debug("Getting table schema for relation {}", str(relation))
             columns.extend(self._get_columns_for_catalog(relation))  # type: ignore[arg-type]
-        return agate.Table.from_object(columns,
-                                       column_types=DEFAULT_TYPE_TESTER)
+        return agate.Table.from_object(columns, column_types=DEFAULT_TYPE_TESTER)
 
     def check_schema_exists(self, database, schema):
         results = self.execute_macro(LIST_SCHEMAS_MACRO_NAME, kwargs={"database": database})

tests/functional/adapter/constraints/test_constraints.py

@@ -63,9 +63,7 @@ class TestMySQLTableConstraintsColumnsEqual(
     pass
 
 
-class TestMySQLViewConstraintsColumnsEqual(
-    MySQLColumnEqualSetup, BaseViewConstraintsColumnsEqual
-):
+class TestMySQLViewConstraintsColumnsEqual(MySQLColumnEqualSetup, BaseViewConstraintsColumnsEqual):
     pass
 
 

tests/unit/utils.py

@@ -78,9 +78,7 @@ def project_from_dict(project, profile, packages=None, selectors=None, cli_vars=
     return partial.render(renderer)
 
 
-def config_from_parts_or_dicts(
-    project, profile, packages=None, selectors=None, cli_vars={}
-):
+def config_from_parts_or_dicts(project, profile, packages=None, selectors=None, cli_vars={}):
     from dbt.config import Project, Profile, RuntimeConfig
     from copy import deepcopy