Apply PR feedback

Author: DamianPendrak

superset/db_engine_specs/base.py

@@ -1326,6 +1326,20 @@ def _extract_error_message(cls, ex: Exception) -> str:
         """Extract error message for queries"""
         return utils.error_msg_from_exception(ex)
 
+    @classmethod
+    def get_database_custom_errors(
+        cls, database_name: str | None
+    ) -> dict[Any, tuple[str, SupersetErrorType, dict[str, Any]]]:
+        config_custom_errors = app.config.get("CUSTOM_DATABASE_ERRORS", {})
+        if not isinstance(config_custom_errors, dict):
+            return {}
+
+        if database_name and database_name in config_custom_errors:
+            database_errors = config_custom_errors[database_name]
+            if isinstance(database_errors, dict):
+                return database_errors
+        return {}
+
     @classmethod
     def extract_errors(
         cls,
@@ -1336,21 +1350,7 @@ def extract_errors(
         raw_message = cls._extract_error_message(ex)
 
         context = context or {}
-
-        config_custom_errors = app.config.get("CUSTOM_DATABASE_ERRORS", {})
-
-        if not isinstance(config_custom_errors, dict):
-            config_custom_errors = {}
-
-        db_engine_custom_errors = {}
-
-        if database_name and database_name in config_custom_errors:
-            database_errors = config_custom_errors[database_name]
-            if isinstance(database_errors, dict):
-                db_engine_custom_errors.update(database_errors)
-
-        if not isinstance(db_engine_custom_errors, dict):
-            db_engine_custom_errors = {}
+        db_engine_custom_errors = cls.get_database_custom_errors(database_name)
 
         for regex, (message, error_type, extra) in [
             *db_engine_custom_errors.items(),

superset/db_engine_specs/databricks.py

@@ -21,7 +21,6 @@
 
 from apispec import APISpec
 from apispec.ext.marshmallow import MarshmallowPlugin
-from flask import current_app as app
 from flask_babel import gettext as __
 from marshmallow import fields, Schema
 from marshmallow.validate import Range
@@ -306,24 +305,14 @@ def extract_errors(
 
         context = context or {}
 
-        config_custom_errors = app.config.get("CUSTOM_DATABASE_ERRORS", {})
         # access_token isn't currently parseable from the
         # databricks error response, but adding it in here
         # for reference if their error message changes
 
         for key, value in cls.context_key_mapping.items():
             context[key] = context.get(value)
 
-        if not isinstance(config_custom_errors, dict):
-            config_custom_errors = {}
-
-        db_engine_custom_errors = {}
-
-        if database_name and database_name in config_custom_errors:
-            database_errors = config_custom_errors[database_name]
-            if isinstance(database_errors, dict):
-                db_engine_custom_errors.update(database_errors)
-
+        db_engine_custom_errors = cls.get_database_custom_errors(database_name)
         if not isinstance(db_engine_custom_errors, dict):
             db_engine_custom_errors = {}