Skip to content

Use built-in exceptions for JDBC sqlalchemy connection extras #70535

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mitre88 wants to merge 1 commit into
base: main
Choose a base branch
from
+4 −7
Open

Use built-in exceptions for JDBC sqlalchemy connection extras #70535

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion generated/known_airflow_exceptions.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -339,7 +339,6 @@ providers/http/src/airflow/providers/http/operators/http.py::2
providers/http/src/airflow/providers/http/triggers/http.py::1
providers/http/tests/unit/http/sensors/test_http.py::2
providers/imap/src/airflow/providers/imap/hooks/imap.py::1
providers/jdbc/src/airflow/providers/jdbc/hooks/jdbc.py::2
providers/jenkins/src/airflow/providers/jenkins/operators/jenkins_job_trigger.py::4
providers/jenkins/src/airflow/providers/jenkins/sensors/jenkins.py::1
providers/keycloak/src/airflow/providers/keycloak/auth_manager/keycloak_auth_manager.py::4
Expand Down
5 changes: 2 additions & 3 deletions providers/jdbc/src/airflow/providers/jdbc/hooks/jdbc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@
import jaydebeapi
from sqlalchemy.engine import URL

from airflow.providers.common.compat.sdk import AirflowException
from airflow.providers.common.sql.hooks.sql import DbApiHook

if TYPE_CHECKING:
Expand Down Expand Up @@ -154,10 +153,10 @@ def sqlalchemy_url(self) -> URL:
conn = self.connection
sqlalchemy_query = conn.extra_dejson.get("sqlalchemy_query", {})
if not isinstance(sqlalchemy_query, dict):
raise AirflowException("The parameter 'sqlalchemy_query' must be of type dict!")
raise TypeError("The parameter 'sqlalchemy_query' must be of type dict!")
sqlalchemy_scheme = conn.extra_dejson.get("sqlalchemy_scheme")
if sqlalchemy_scheme is None:
raise AirflowException(
raise ValueError(
"The parameter 'sqlalchemy_scheme' must be defined in extra for JDBC connections!"
)
return URL.create(
Expand Down
5 changes: 2 additions & 3 deletions providers/jdbc/tests/unit/jdbc/hooks/test_jdbc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,6 @@
import pytest

from airflow.models import Connection
from airflow.providers.common.compat.sdk import AirflowException
from airflow.providers.jdbc.hooks.jdbc import JdbcHook, suppress_and_warn

jdbc_conn_mock = Mock(name="jdbc_conn")
Expand Down Expand Up @@ -217,7 +216,7 @@ def test_sqlalchemy_url_without_sqlalchemy_scheme(self):
hook_params = {"driver_path": "ParamDriverPath", "driver_class": "ParamDriverClass"}
hook = get_hook(hook_params=hook_params)

with pytest.raises(AirflowException):
with pytest.raises(ValueError, match="'sqlalchemy_scheme' must be defined"):
hook.sqlalchemy_url

def test_sqlalchemy_url_with_sqlalchemy_scheme(self):
Expand All @@ -243,7 +242,7 @@ def test_sqlalchemy_url_with_sqlalchemy_scheme_and_wrong_query_value(self):
hook_params = {"driver_path": "ParamDriverPath", "driver_class": "ParamDriverClass"}
hook = get_hook(conn_params=conn_params, hook_params=hook_params)

with pytest.raises(AirflowException):
with pytest.raises(TypeError, match="'sqlalchemy_query' must be of type dict"):
hook.sqlalchemy_url

def test_get_sqlalchemy_engine_verify_creator_is_being_used(self):
Expand Down
Loading