Always pass named type_ arg to drop_constraint (apache#31306)

It seems Alembic recently starts to enforce this argument being passed using a keyword (instead of positional). These are failing since the upstream change.
potiuk · May 16, 2023 · 4dacab3 · 4dacab3
1 parent caeca2d
commit 4dacab3
Show file tree

Hide file tree

Showing 5 changed files with 8 additions and 8 deletions.
diff --git a/airflow/migrations/versions/0089_2_2_0_make_xcom_pkey_columns_non_nullable.py b/airflow/migrations/versions/0089_2_2_0_make_xcom_pkey_columns_non_nullable.py
@@ -54,7 +54,7 @@ def downgrade():
         # columns were always non-nullable for mysql, sqlite and postgres, so leave them alone
 
         if conn.dialect.name == "mssql":
-            bop.drop_constraint("pk_xcom", "primary")
+            bop.drop_constraint("pk_xcom", type_="primary")
             # execution_date and key wasn't nullable in the other databases
             bop.alter_column("key", type_=StringID(length=512), nullable=True)
             bop.alter_column("execution_date", type_=TIMESTAMP, nullable=True)
diff --git a/airflow/migrations/versions/0093_2_2_0_taskinstance_keyed_to_dagrun.py b/airflow/migrations/versions/0093_2_2_0_taskinstance_keyed_to_dagrun.py
@@ -351,8 +351,8 @@ def downgrade():
     if dialect_name == "mssql":
 
         with op.batch_alter_table("dag_run", schema=None) as batch_op:
-            batch_op.drop_constraint("dag_run_dag_id_execution_date_key", "unique")
-            batch_op.drop_constraint("dag_run_dag_id_run_id_key", "unique")
+            batch_op.drop_constraint("dag_run_dag_id_execution_date_key", type_="unique")
+            batch_op.drop_constraint("dag_run_dag_id_run_id_key", type_="unique")
             batch_op.drop_index("dag_id_state")
             batch_op.drop_index("idx_dag_run_running_dags")
             batch_op.drop_index("idx_dag_run_queued_dags")

diff --git a/airflow/migrations/versions/0100_2_3_0_add_taskmap_and_map_id_on_taskinstance.py b/airflow/migrations/versions/0100_2_3_0_add_taskmap_and_map_id_on_taskinstance.py
@@ -45,7 +45,7 @@ def upgrade():
     """
     # We need to first remove constraints on task_reschedule since they depend on task_instance.
     with op.batch_alter_table("task_reschedule") as batch_op:
-        batch_op.drop_constraint("task_reschedule_ti_fkey", "foreignkey")
+        batch_op.drop_constraint("task_reschedule_ti_fkey", type_="foreignkey")
         batch_op.drop_index("idx_task_reschedule_dag_task_run")
 
     # Change task_instance's primary key.
@@ -100,7 +100,7 @@ def downgrade():
     op.drop_table("task_map")
 
     with op.batch_alter_table("task_reschedule") as batch_op:
-        batch_op.drop_constraint("task_reschedule_ti_fkey", "foreignkey")
+        batch_op.drop_constraint("task_reschedule_ti_fkey", type_="foreignkey")
         batch_op.drop_index("idx_task_reschedule_dag_task_run")
         batch_op.drop_column("map_index", mssql_drop_default=True)
 

diff --git a/docs/apache-airflow/img/airflow_erd.sha256 b/docs/apache-airflow/img/airflow_erd.sha256
@@ -1 +1 @@
-d3e1272db6e730812ad1c6c317e8de0147aee7b4c02cc33cb096645a408eedd5
+4995c94849a5848e551e85ffeb99d3dda9f652f3c2d7b3cf3aa16c02911690d3
diff --git a/docs/apache-airflow/img/airflow_erd.svg b/docs/apache-airflow/img/airflow_erd.svg
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		d3e1272db6e730812ad1c6c317e8de0147aee7b4c02cc33cb096645a408eedd5
		4995c94849a5848e551e85ffeb99d3dda9f652f3c2d7b3cf3aa16c02911690d3