Fix migration for main vs v2-9-stable

apache · Apr 25, 2024 · ae7f1f4 · ae7f1f4
1 parent 492bdec
commit ae7f1f4
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/airflow/migrations/versions/0140_2_9_0_update_trigger_kwargs_type.py b/airflow/migrations/versions/0140_2_9_0_update_trigger_kwargs_type.py
@@ -28,6 +28,7 @@
 
 from alembic import context, op
 import sqlalchemy as sa
+from sqlalchemy.orm import lazyload
 
 from airflow.serialization.serialized_objects import BaseSerialization
 from airflow.models.trigger import Trigger
@@ -54,7 +55,7 @@ def upgrade():
  if not context.is_offline_mode():
  session = get_session()
  try:
- for trigger in session.query(Trigger):
+ for trigger in session.query(Trigger).options(lazyload(Trigger.task_instance)):
  trigger.kwargs = trigger.kwargs
  session.commit()
  finally:
@@ -73,7 +74,7 @@ def downgrade():
  else:
  session = get_session()
  try:
- for trigger in session.query(Trigger):
+ for trigger in session.query(Trigger).options(lazyload(Trigger.task_instance)):
  trigger.encrypted_kwargs = json.dumps(BaseSerialization.serialize(trigger.kwargs))
  session.commit()
  finally:

diff --git a/docs/apache-airflow/img/airflow_erd.sha256 b/docs/apache-airflow/img/airflow_erd.sha256
@@ -1 +1 @@
-9db120e528821a244eca9507bc6d668473e44d1be4e30c6c1a6c70d00ff9edb1
+5c547f9469f60d73065be02c3903ae7dd5bbbae81317e42e358ec0ec97e82f85
diff --git a/docs/apache-airflow/img/airflow_erd.svg b/docs/apache-airflow/img/airflow_erd.svg