This is an automated email from the ASF dual-hosted git repository.
potiuk pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/main by this push:
new eaeb967b245 chore: rebase onto main to retrigger CI (#70535)
eaeb967b245 is described below
commit eaeb967b245ef393f013ef00667c2da09ad7ddce
Author: Dr Alex Mitre <[email protected]>
AuthorDate: Thu Aug 13 06:23:19 2026 -0600
chore: rebase onto main to retrigger CI (#70535)
No logic change. Rebased PR #70535.
Co-authored-by: mitre88 <[email protected]>
---
generated/known_airflow_exceptions.txt | 1 -
providers/jdbc/src/airflow/providers/jdbc/hooks/jdbc.py | 5 ++---
providers/jdbc/tests/unit/jdbc/hooks/test_jdbc.py | 5 ++---
3 files changed, 4 insertions(+), 7 deletions(-)
diff --git a/generated/known_airflow_exceptions.txt
b/generated/known_airflow_exceptions.txt
index b9615408a99..8be3fafad4a 100644
--- a/generated/known_airflow_exceptions.txt
+++ b/generated/known_airflow_exceptions.txt
@@ -337,7 +337,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
diff --git a/providers/jdbc/src/airflow/providers/jdbc/hooks/jdbc.py
b/providers/jdbc/src/airflow/providers/jdbc/hooks/jdbc.py
index a09376d4980..c4b6fbf193c 100644
--- a/providers/jdbc/src/airflow/providers/jdbc/hooks/jdbc.py
+++ b/providers/jdbc/src/airflow/providers/jdbc/hooks/jdbc.py
@@ -27,7 +27,6 @@ from urllib.parse import quote_plus, urlencode
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:
@@ -154,10 +153,10 @@ class JdbcHook(DbApiHook):
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(
diff --git a/providers/jdbc/tests/unit/jdbc/hooks/test_jdbc.py
b/providers/jdbc/tests/unit/jdbc/hooks/test_jdbc.py
index ff4fbe4733e..afea4308850 100644
--- a/providers/jdbc/tests/unit/jdbc/hooks/test_jdbc.py
+++ b/providers/jdbc/tests/unit/jdbc/hooks/test_jdbc.py
@@ -31,7 +31,6 @@ import jaydebeapi
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")
@@ -217,7 +216,7 @@ class TestJdbcHook:
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):
@@ -243,7 +242,7 @@ class TestJdbcHook:
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):
