Skip to content

Refactor deprecated SQLA query databricks provider #59441

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

Closed
choo121600 wants to merge 2 commits into from
Closed

Refactor deprecated SQLA query databricks provider #59441

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
3659899
Refactor deprecated SQLA query databricks provider
choo121600 Dec 15, 2025
f85eea6
Update test_databricks_workflow.py to use scalars
choo121600 Dec 15, 2025
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: 1 addition & 0 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,7 @@ repos:
^airflow-ctl.*\.py$|
^airflow-core/src/airflow/models/.*\.py$|
^airflow-core/tests/unit/api_fastapi/core_api/routes/public/test_assets.py$|
^providers/databricks/.*\.py$|
^task_sdk.*\.py$
pass_filenames: true
- id: update-supported-versions
Expand Down
14 changes: 8 additions & 6 deletions providers/databricks/src/airflow/providers/databricks/plugins/databricks_workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,8 @@
from typing import TYPE_CHECKING, Any
from urllib.parse import unquote

from sqlalchemy import select

from airflow.exceptions import TaskInstanceNotFound
from airflow.models.dagrun import DagRun
from airflow.models.taskinstance import TaskInstance, TaskInstanceKey, clear_task_instances
Expand Down Expand Up @@ -143,7 +145,9 @@ def _get_dagrun(dag, run_id: str, session: Session) -> DagRun:
if not session:
raise AirflowException("Session not provided.")

return session.query(DagRun).filter(DagRun.dag_id == dag.dag_id, DagRun.run_id == run_id).one()
return session.scalars(
select(DagRun).where(DagRun.dag_id == dag.dag_id, DagRun.run_id == run_id)
).one()

@provide_session
def _clear_task_instances(
Expand All @@ -162,15 +166,13 @@ def get_task_instance(operator: BaseOperator, dttm, session: Session = NEW_SESSI
dag_run = DagRun.find(dag_id, execution_date=dttm)[0] # type: ignore[call-arg]
else:
dag_run = DagRun.find(dag_id, logical_date=dttm)[0]
ti = (
session.query(TaskInstance)
.filter(
ti = session.scalars(
select(TaskInstance).where(
TaskInstance.dag_id == dag_id,
TaskInstance.run_id == dag_run.run_id,
TaskInstance.task_id == operator.task_id,
)
.one_or_none()
)
).one_or_none()
if not ti:
raise TaskInstanceNotFound("Task instance not found")
return ti
Expand Down
4 changes: 2 additions & 2 deletions providers/databricks/tests/unit/databricks/plugins/test_databricks_workflow.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@ def test_get_dagrun_airflow2():

session = MagicMock()
dag = MagicMock(dag_id=DAG_ID)
session.query.return_value.filter.return_value.one.return_value = DagRun()
session.scalars.return_value.one.return_value = DagRun()

result = _get_dagrun(dag, RUN_ID, session=session)

Expand Down Expand Up @@ -168,7 +168,7 @@ def test_get_task_instance_airflow2():
dttm = "2022-01-01T00:00:00Z"
session = Mock()
dag_run = Mock()
session.query().filter().one_or_none.return_value = dag_run
session.scalars().one_or_none.return_value = dag_run

with patch(
"airflow.providers.databricks.plugins.databricks_workflow.DagRun.find", return_value=[dag_run]
Expand Down