This is an automated email from the ASF dual-hosted git repository. ephraimanierobi pushed a commit to branch v2-7-test in repository https://gitbox.apache.org/repos/asf/airflow.git
commit 033ffa91be1b827286d3eeb7dd1866c490f5b405 Author: Daniel Standish <[email protected]> AuthorDate: Sun Oct 1 05:33:17 2023 -0700 Fix foreign key warning re ab_user.id (#34656) Introduced in #34120. (cherry picked from commit 1fdc2311250fbae47749822b192a99066600f8ad) --- airflow/models/dagrun.py | 2 +- airflow/models/taskinstance.py | 4 +--- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/airflow/models/dagrun.py b/airflow/models/dagrun.py index 7308758333..81e93938df 100644 --- a/airflow/models/dagrun.py +++ b/airflow/models/dagrun.py @@ -1412,8 +1412,8 @@ class DagRunNote(Base): user_id = Column( Integer, + ForeignKey("ab_user.id", name="dag_run_note_user_fkey"), nullable=True, - foreign_key=ForeignKey("ab_user.id", name="dag_run_note_user_fkey"), ) dag_run_id = Column(Integer, primary_key=True, nullable=False) content = Column(String(1000).with_variant(Text(1000), "mysql")) diff --git a/airflow/models/taskinstance.py b/airflow/models/taskinstance.py index 4919514c13..ec28fe0f6a 100644 --- a/airflow/models/taskinstance.py +++ b/airflow/models/taskinstance.py @@ -3018,9 +3018,7 @@ class TaskInstanceNote(Base): __tablename__ = "task_instance_note" - user_id = Column( - Integer, nullable=True, foreign_key=ForeignKey("ab_user.id", name="task_instance_note_user_fkey") - ) + user_id = Column(Integer, ForeignKey("ab_user.id", name="task_instance_note_user_fkey"), nullable=True) task_id = Column(StringID(), primary_key=True, nullable=False) dag_id = Column(StringID(), primary_key=True, nullable=False) run_id = Column(StringID(), primary_key=True, nullable=False)
