diff --git a/airflow/providers/google/cloud/operators/bigquery.py b/airflow/providers/google/cloud/operators/bigquery.py index 268bbc1cad8c29..1a6bd3e62068e4 100644 --- a/airflow/providers/google/cloud/operators/bigquery.py +++ b/airflow/providers/google/cloud/operators/bigquery.py @@ -2130,7 +2130,7 @@ def _job_id(self, context): if self.job_id: return f"{self.job_id}_{uniqueness_suffix}" - exec_date = context['execution_date'].isoformat() + exec_date = context['logical_date'].isoformat() job_id = f"airflow_{self.dag_id}_{self.task_id}_{exec_date}_{uniqueness_suffix}" return re.sub(r"[:\-+.]", "_", job_id) diff --git a/tests/providers/google/cloud/operators/test_bigquery.py b/tests/providers/google/cloud/operators/test_bigquery.py index b5e42cce2f96ac..490966384b219c 100644 --- a/tests/providers/google/cloud/operators/test_bigquery.py +++ b/tests/providers/google/cloud/operators/test_bigquery.py @@ -1020,7 +1020,7 @@ def test_execute_no_force_rerun(self, mock_hook, mock_md5): def test_job_id_validity(self, mock_md5, test_dag_id, expected_job_id): hash_ = "hash" mock_md5.return_value.hexdigest.return_value = hash_ - context = {"execution_date": datetime(2020, 1, 23)} + context = {"logical_date": datetime(2020, 1, 23)} configuration = { "query": { "query": "SELECT * FROM any", diff --git a/tests/system/providers/google/bigquery/example_bigquery_queries.py b/tests/system/providers/google/bigquery/example_bigquery_queries.py index be34df79ef79e3..4efe8f2191ea8b 100644 --- a/tests/system/providers/google/bigquery/example_bigquery_queries.py +++ b/tests/system/providers/google/bigquery/example_bigquery_queries.py @@ -21,7 +21,6 @@ """ import os from datetime import datetime -from pathlib import Path from airflow import models from airflow.operators.bash import BashOperator @@ -40,7 +39,7 @@ ENV_ID = os.environ.get("SYSTEM_TESTS_ENV_ID") PROJECT_ID = os.environ.get("SYSTEM_TESTS_GCP_PROJECT") LOCATION = "us-east1" -QUERY_SQL_PATH = str(Path(__file__).parent / "resources" / "example_bigquery_query.sql") +QUERY_SQL_PATH = "resources/example_bigquery_query.sql" TABLE_1 = "table1" TABLE_2 = "table2"