Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -70,11 +70,6 @@ def __init__(
**kwargs,
):
# Handle the scenario where either both statement and statement_id are set/not set
if statement and statement_id:
raise AirflowException("Cannot provide both statement and statement_id.")
if not statement and not statement_id:
raise AirflowException("One of either statement or statement_id must be provided.")

if not warehouse_id:
raise AirflowException("warehouse_id must be provided.")

Expand Down Expand Up @@ -112,6 +107,10 @@ def _get_hook(self, caller: str) -> DatabricksHook:
)

def execute(self, context: Context):
if self.statement and self.statement_id:
raise AirflowException("Cannot provide both statement and statement_id.")
if not self.statement and not self.statement_id:
raise AirflowException("One of either statement or statement_id must be provided.")
if not self.statement_id:
# Otherwise, we'll go ahead and "submit" the statement
tags = build_query_tags(context, self.query_tags, self.include_airflow_query_tags)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,18 @@ def test_init_statement_id(self):
assert op.statement_id == STATEMENT_ID
assert op.warehouse_id == WAREHOUSE_ID

@pytest.mark.parametrize(
("kwargs", "match"),
[
({"statement": STATEMENT, "statement_id": STATEMENT_ID}, "Cannot provide both"),
({}, "One of either statement or statement_id"),
],
)
def test_statement_combination_validated_at_execute(self, kwargs, match):
op = DatabricksSQLStatementsSensor(task_id=TASK_ID, warehouse_id=WAREHOUSE_ID, **kwargs)
with pytest.raises(AirflowException, match=match):
op.execute(None)

@mock.patch("airflow.providers.databricks.sensors.databricks.DatabricksHook")
def test_exec_success(self, db_mock_class):
"""
Expand Down
1 change: 0 additions & 1 deletion scripts/ci/prek/validate_operators_init_exemptions.txt
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ providers/cncf/kubernetes/src/airflow/providers/cncf/kubernetes/operators/pod.py
providers/databricks/src/airflow/providers/databricks/operators/databricks_repos.py::DatabricksReposCreateOperator
providers/databricks/src/airflow/providers/databricks/operators/databricks_repos.py::DatabricksReposDeleteOperator
providers/databricks/src/airflow/providers/databricks/operators/databricks_repos.py::DatabricksReposUpdateOperator
providers/databricks/src/airflow/providers/databricks/sensors/databricks.py::DatabricksSQLStatementsSensor
providers/docker/src/airflow/providers/docker/operators/docker.py::DockerOperator
providers/google/src/airflow/providers/google/cloud/operators/bigquery.py::BigQueryInsertJobOperator
providers/google/src/airflow/providers/google/cloud/operators/cloud_batch.py::CloudBatchSubmitJobOperator
Expand Down