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 41869d3840 Suppress jaydebeapi.Error when setAutoCommit or
getAutoCommit is unsupported by JDBC driver (#38707)
41869d3840 is described below
commit 41869d3840a959a8ad87e0973656606f080d8608
Author: David Blain <i...@dabla.be>
AuthorDate: Fri Apr 12 11:44:27 2024 +0200
Suppress jaydebeapi.Error when setAutoCommit or getAutoCommit is
unsupported by JDBC driver (#38707)
---------
Co-authored-by: David Blain <david.bl...@infrabel.be>
---
airflow/providers/jdbc/hooks/jdbc.py | 19 +++++++++++++++++--
tests/providers/jdbc/hooks/test_jdbc.py | 28 +++++++++++++++++++++++++++-
2 files changed, 44 insertions(+), 3 deletions(-)
diff --git a/airflow/providers/jdbc/hooks/jdbc.py
b/airflow/providers/jdbc/hooks/jdbc.py
index dd592652ae..832c16b9aa 100644
--- a/airflow/providers/jdbc/hooks/jdbc.py
+++ b/airflow/providers/jdbc/hooks/jdbc.py
@@ -17,6 +17,9 @@
# under the License.
from __future__ import annotations
+import traceback
+import warnings
+from contextlib import contextmanager
from typing import TYPE_CHECKING, Any
import jaydebeapi
@@ -27,6 +30,15 @@ if TYPE_CHECKING:
from airflow.models.connection import Connection
+@contextmanager
+def suppress_and_warn(*exceptions: type[BaseException]):
+ """Context manager that suppresses the given exceptions and logs a warning
message."""
+ try:
+ yield
+ except exceptions as e:
+ warnings.warn(f"Exception suppressed: {e}\n{traceback.format_exc()}",
category=UserWarning)
+
+
class JdbcHook(DbApiHook):
"""General hook for JDBC access.
@@ -152,7 +164,8 @@ class JdbcHook(DbApiHook):
:param conn: The connection.
:param autocommit: The connection's autocommit setting.
"""
- conn.jconn.setAutoCommit(autocommit)
+ with suppress_and_warn(jaydebeapi.Error):
+ conn.jconn.setAutoCommit(autocommit)
def get_autocommit(self, conn: jaydebeapi.Connection) -> bool:
"""Get autocommit setting for the provided connection.
@@ -162,4 +175,6 @@ class JdbcHook(DbApiHook):
to True on the connection. False if it is either not set, set to
False, or the connection does not support auto-commit.
"""
- return conn.jconn.getAutoCommit()
+ with suppress_and_warn(jaydebeapi.Error):
+ return conn.jconn.getAutoCommit()
+ return False
diff --git a/tests/providers/jdbc/hooks/test_jdbc.py
b/tests/providers/jdbc/hooks/test_jdbc.py
index 8b303db67e..80eedf8ee4 100644
--- a/tests/providers/jdbc/hooks/test_jdbc.py
+++ b/tests/providers/jdbc/hooks/test_jdbc.py
@@ -22,11 +22,14 @@ import logging
from unittest import mock
from unittest.mock import Mock, patch
+import jaydebeapi
import pytest
+from airflow.exceptions import DeserializingResultError
from airflow.models import Connection
-from airflow.providers.jdbc.hooks.jdbc import JdbcHook
+from airflow.providers.jdbc.hooks.jdbc import JdbcHook, suppress_and_warn
from airflow.utils import db
+from airflow.utils.context import AirflowContextDeprecationWarning
pytestmark = pytest.mark.db_test
@@ -82,6 +85,13 @@ class TestJdbcHook:
jdbc_hook.set_autocommit(jdbc_conn, False)
jdbc_conn.jconn.setAutoCommit.assert_called_once_with(False)
+ @patch("airflow.providers.jdbc.hooks.jdbc.jaydebeapi.connect")
+ def test_jdbc_conn_set_autocommit_when_not_supported(self, _):
+ jdbc_hook = JdbcHook()
+ jdbc_conn = jdbc_hook.get_conn()
+ jdbc_conn.jconn.setAutoCommit.side_effect = jaydebeapi.Error()
+ jdbc_hook.set_autocommit(jdbc_conn, False)
+
@patch("airflow.providers.jdbc.hooks.jdbc.jaydebeapi.connect")
def test_jdbc_conn_get_autocommit(self, _):
jdbc_hook = JdbcHook()
@@ -89,6 +99,13 @@ class TestJdbcHook:
jdbc_hook.get_autocommit(jdbc_conn)
jdbc_conn.jconn.getAutoCommit.assert_called_once_with()
+ @patch("airflow.providers.jdbc.hooks.jdbc.jaydebeapi.connect")
+ def
test_jdbc_conn_get_autocommit_when_not_supported_then_return_false(self, _):
+ jdbc_hook = JdbcHook()
+ jdbc_conn = jdbc_hook.get_conn()
+ jdbc_conn.jconn.getAutoCommit.side_effect = jaydebeapi.Error()
+ assert jdbc_hook.get_autocommit(jdbc_conn) is False
+
def test_driver_hook_params(self):
hook = get_hook(hook_params=dict(driver_path="Blah driver path",
driver_class="Blah driver class"))
assert hook.driver_path == "Blah driver path"
@@ -161,3 +178,12 @@ class TestJdbcHook:
"have supplied 'driver_class' via connection extra but it
will not be used"
) in caplog.text
assert driver_class == "Blah driver class"
+
+ def test_suppress_and_warn_when_raised_exception_is_suppressed(self):
+ with suppress_and_warn(AirflowContextDeprecationWarning):
+ raise AirflowContextDeprecationWarning()
+
+ def test_suppress_and_warn_when_raised_exception_is_not_suppressed(self):
+ with pytest.raises(AirflowContextDeprecationWarning):
+ with suppress_and_warn(DeserializingResultError):
+ raise AirflowContextDeprecationWarning()
