This is an automated email from the ASF dual-hosted git repository.
uranusjr pushed a commit to branch v2-10-test
in repository https://gitbox.apache.org/repos/asf/airflow.git
The following commit(s) were added to refs/heads/v2-10-test by this push:
new 22b20d692ad Add logical_date to models using execution_date (#44283)
22b20d692ad is described below
commit 22b20d692adc2899a878d7f88df3c23cd6ee087e
Author: Tzu-ping Chung <[email protected]>
AuthorDate: Thu Feb 20 14:32:27 2025 +0800
Add logical_date to models using execution_date (#44283)
Airflow 3 renames all database columns from 'execution_date' to
'logical_date'. This backports the new name to 2.x so users can change
their code accessing those fields to use the new name before upgrading
to Airflow 3.
---
airflow/models/log.py | 6 ++++++
airflow/models/renderedtifields.py | 1 +
airflow/models/slamiss.py | 9 +++++++++
airflow/models/taskinstance.py | 1 +
airflow/models/taskreschedule.py | 1 +
airflow/models/xcom.py | 1 +
scripts/ci/pre_commit/check_ti_vs_tis_attributes.py | 1 +
7 files changed, 20 insertions(+)
diff --git a/airflow/models/log.py b/airflow/models/log.py
index 145f659b338..4aa20d5d6c8 100644
--- a/airflow/models/log.py
+++ b/airflow/models/log.py
@@ -26,6 +26,8 @@ from airflow.utils import timezone
from airflow.utils.sqlalchemy import UtcDateTime
if TYPE_CHECKING:
+ from datetime import datetime
+
from airflow.models.taskinstance import TaskInstance
from airflow.models.taskinstancekey import TaskInstanceKey
@@ -100,3 +102,7 @@ class Log(Base):
def __str__(self) -> str:
return f"Log({self.event}, {self.task_id}, {self.owner},
{self.owner_display_name}, {self.extra})"
+
+ @property
+ def logical_date(self) -> datetime:
+ return self.execution_date
diff --git a/airflow/models/renderedtifields.py
b/airflow/models/renderedtifields.py
index 5b0b2bef52d..1af274142f2 100644
--- a/airflow/models/renderedtifields.py
+++ b/airflow/models/renderedtifields.py
@@ -115,6 +115,7 @@ class RenderedTaskInstanceFields(TaskInstanceDependencies):
)
execution_date = association_proxy("dag_run", "execution_date")
+ logical_date = association_proxy("dag_run", "execution_date")
def __init__(self, ti: TaskInstance, render_templates=True,
rendered_fields=None):
self.dag_id = ti.dag_id
diff --git a/airflow/models/slamiss.py b/airflow/models/slamiss.py
index 4fb7e53a17b..0eb3799693f 100644
--- a/airflow/models/slamiss.py
+++ b/airflow/models/slamiss.py
@@ -17,11 +17,16 @@
# under the License.
from __future__ import annotations
+from typing import TYPE_CHECKING
+
from sqlalchemy import Boolean, Column, Index, String, Text
from airflow.models.base import COLLATION_ARGS, ID_LEN, Base
from airflow.utils.sqlalchemy import UtcDateTime
+if TYPE_CHECKING:
+ from datetime import datetime
+
class SlaMiss(Base):
"""
@@ -44,3 +49,7 @@ class SlaMiss(Base):
def __repr__(self):
return str((self.dag_id, self.task_id,
self.execution_date.isoformat()))
+
+ @property
+ def logical_date(self) -> datetime:
+ return self.execution_date
diff --git a/airflow/models/taskinstance.py b/airflow/models/taskinstance.py
index f84f898f338..805194ad00e 100644
--- a/airflow/models/taskinstance.py
+++ b/airflow/models/taskinstance.py
@@ -1902,6 +1902,7 @@ class TaskInstance(Base, LoggingMixin):
dag_run = relationship("DagRun", back_populates="task_instances",
lazy="joined", innerjoin=True)
rendered_task_instance_fields = relationship("RenderedTaskInstanceFields",
lazy="noload", uselist=False)
execution_date = association_proxy("dag_run", "execution_date")
+ logical_date = association_proxy("dag_run", "execution_date")
task_instance_note = relationship(
"TaskInstanceNote",
back_populates="task_instance",
diff --git a/airflow/models/taskreschedule.py b/airflow/models/taskreschedule.py
index 55fe9e4b8ed..869553a8ee3 100644
--- a/airflow/models/taskreschedule.py
+++ b/airflow/models/taskreschedule.py
@@ -80,6 +80,7 @@ class TaskReschedule(TaskInstanceDependencies):
)
dag_run = relationship("DagRun")
execution_date = association_proxy("dag_run", "execution_date")
+ logical_date = association_proxy("dag_run", "execution_date")
def __init__(
self,
diff --git a/airflow/models/xcom.py b/airflow/models/xcom.py
index 9829f11fbbd..1a01edcb3c7 100644
--- a/airflow/models/xcom.py
+++ b/airflow/models/xcom.py
@@ -119,6 +119,7 @@ class BaseXCom(TaskInstanceDependencies, LoggingMixin):
passive_deletes="all",
)
execution_date = association_proxy("dag_run", "execution_date")
+ logical_date = association_proxy("dag_run", "execution_date")
@reconstructor
def init_on_load(self):
diff --git a/scripts/ci/pre_commit/check_ti_vs_tis_attributes.py
b/scripts/ci/pre_commit/check_ti_vs_tis_attributes.py
index c8cb358960f..6ba394bbd14 100755
--- a/scripts/ci/pre_commit/check_ti_vs_tis_attributes.py
+++ b/scripts/ci/pre_commit/check_ti_vs_tis_attributes.py
@@ -48,6 +48,7 @@ def compare_attributes(path1, path2):
"task_instance_note",
"dag_run",
"trigger",
+ "execution_date",
"logical_date",
"triggerer_job",
"note",
