Skip to content

Fixing JdbcOperator non-SELECT statement run #25412

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

Merged
potiuk merged 2 commits into from
Aug 7, 2022
Merged

Fixing JdbcOperator non-SELECT statement run #25412

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0901bbe
Fixing JdbcOperator non-SELECT statement run
kazanzhy Jul 29, 2022
5dba22c
Correct function type
kazanzhy Aug 2, 2022
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
9 changes: 7 additions & 2 deletions airflow/providers/jdbc/operators/jdbc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
# specific language governing permissions and limitations
# under the License.

from typing import TYPE_CHECKING, Iterable, Mapping, Optional, Sequence, Union
from typing import TYPE_CHECKING, Any, Callable, Iterable, Mapping, Optional, Sequence, Union

from airflow.models import BaseOperator
from airflow.providers.common.sql.hooks.sql import fetch_all_handler
Expand Down Expand Up @@ -57,16 +57,21 @@ def __init__(
jdbc_conn_id: str = 'jdbc_default',
autocommit: bool = False,
parameters: Optional[Union[Iterable, Mapping]] = None,
handler: Callable[[Any], Any] = fetch_all_handler,
**kwargs,
) -> None:
super().__init__(**kwargs)
self.parameters = parameters
self.sql = sql
self.jdbc_conn_id = jdbc_conn_id
self.autocommit = autocommit
self.handler = handler
self.hook = None

def execute(self, context: 'Context'):
self.log.info('Executing: %s', self.sql)
hook = JdbcHook(jdbc_conn_id=self.jdbc_conn_id)
return hook.run(self.sql, self.autocommit, parameters=self.parameters, handler=fetch_all_handler)
if self.do_xcom_push:
return hook.run(self.sql, self.autocommit, parameters=self.parameters, handler=self.handler)
else:
return hook.run(self.sql, self.autocommit, parameters=self.parameters)
16 changes: 14 additions & 2 deletions tests/providers/jdbc/operators/test_jdbc.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,8 +28,8 @@ def setUp(self):
self.kwargs = dict(sql='sql', task_id='test_jdbc_operator', dag=None)

@patch('airflow.providers.jdbc.operators.jdbc.JdbcHook')
def test_execute(self, mock_jdbc_hook):
jdbc_operator = JdbcOperator(**self.kwargs)
def test_execute_do_push(self, mock_jdbc_hook):
jdbc_operator = JdbcOperator(**self.kwargs, do_xcom_push=True)
jdbc_operator.execute(context={})

mock_jdbc_hook.assert_called_once_with(jdbc_conn_id=jdbc_operator.jdbc_conn_id)
Expand All @@ -39,3 +39,15 @@ def test_execute(self, mock_jdbc_hook):
parameters=jdbc_operator.parameters,
handler=fetch_all_handler,
)

@patch('airflow.providers.jdbc.operators.jdbc.JdbcHook')
def test_execute_dont_push(self, mock_jdbc_hook):
jdbc_operator = JdbcOperator(**self.kwargs, do_xcom_push=False)
jdbc_operator.execute(context={})

mock_jdbc_hook.assert_called_once_with(jdbc_conn_id=jdbc_operator.jdbc_conn_id)
mock_jdbc_hook.return_value.run.assert_called_once_with(
jdbc_operator.sql,
jdbc_operator.autocommit,
parameters=jdbc_operator.parameters,
)