fix for sqlite

apache · Nov 22, 2024 · 7940140 · 7940140
1 parent dfaec5d
commit 7940140
Show file tree

Hide file tree

Showing 12 changed files with 64 additions and 20 deletions.
diff --git a/airflow/migrations/versions/0041_3_0_0_rename_dataset_as_asset.py b/airflow/migrations/versions/0041_3_0_0_rename_dataset_as_asset.py
@@ -285,13 +285,6 @@ def upgrade():
             unique=False,
         )
 
-        batch_op.create_foreign_key(
-            constraint_name="toar_asset_fkey",
-            referent_table="asset",
-            local_cols=["asset_id"],
-            remote_cols=["id"],
-            ondelete="CASCADE",
-        )
         batch_op.create_foreign_key(
             constraint_name="toar_dag_id_fkey",
             referent_table="dag",
@@ -321,13 +314,6 @@ def upgrade():
             unique=False,
         )
 
-        batch_op.create_foreign_key(
-            constraint_name="adrq_asset_fkey",
-            referent_table="asset",
-            local_cols=["asset_id"],
-            remote_cols=["id"],
-            ondelete="CASCADE",
-        )
         batch_op.create_foreign_key(
             constraint_name="adrq_dag_fkey",
             referent_table="dag",
@@ -565,7 +551,7 @@ def downgrade():
     with op.batch_alter_table("task_outlet_dataset_reference", schema=None) as batch_op:
         batch_op.alter_column("asset_id", new_column_name="dataset_id", type_=sa.Integer(), nullable=False)
 
-        batch_op.drop_constraint("toar_asset_fkey", type_="foreignkey")
+        # batch_op.drop_constraint("toar_asset_fkey", type_="foreignkey")
         batch_op.drop_constraint("toar_dag_id_fkey", type_="foreignkey")
 
         _rename_index(
@@ -600,7 +586,7 @@ def downgrade():
     with op.batch_alter_table("dataset_dag_run_queue", schema=None) as batch_op:
         batch_op.alter_column("asset_id", new_column_name="dataset_id", type_=sa.Integer(), nullable=False)
 
-        batch_op.drop_constraint("adrq_asset_fkey", type_="foreignkey")
+        # batch_op.drop_constraint("adrq_asset_fkey", type_="foreignkey")
         batch_op.drop_constraint("adrq_dag_fkey", type_="foreignkey")
 
         _rename_pk_constraint(

diff --git a/airflow/migrations/versions/0042_3_0_0_create_fks_as_datasets_are_renamed.py b/airflow/migrations/versions/0042_3_0_0_create_fks_as_datasets_are_renamed.py
@@ -0,0 +1,55 @@
+#
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+#
+#   http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+
+"""
+create foreign key constraints for assets.
+
+Revision ID: c4a1639f0f67
+Revises: 05234396c6fc
+Create Date: 2024-11-22 09:49:41.813016
+
+"""
+
+from __future__ import annotations
+
+from alembic import op
+
+# revision identifiers, used by Alembic.
+revision = "c4a1639f0f67"
+down_revision = "05234396c6fc"
+branch_labels = None
+depends_on = None
+airflow_version = "3.0.0"
+
+
+def upgrade():
+    """Apply create foreign key constraints for assets."""
+    with op.batch_alter_table("asset_dag_run_queue", schema=None) as batch_op:
+        batch_op.create_foreign_key("adrq_asset_fkey", "asset", ["asset_id"], ["id"], ondelete="CASCADE")
+
+    with op.batch_alter_table("task_outlet_asset_reference", schema=None) as batch_op:
+        batch_op.create_foreign_key("toar_asset_fkey", "asset", ["asset_id"], ["id"], ondelete="CASCADE")
+
+
+def downgrade():
+    """Unapply create foreign key constraints for assets."""
+    with op.batch_alter_table("task_outlet_asset_reference", schema=None) as batch_op:
+        batch_op.drop_constraint("toar_asset_fkey", type_="foreignkey")
+
+    with op.batch_alter_table("asset_dag_run_queue", schema=None) as batch_op:
+        batch_op.drop_constraint("adrq_asset_fkey", type_="foreignkey")
diff --git a/...add_uuid_primary_key_to_task_instance_.py → ...add_uuid_primary_key_to_task_instance_.py b/...add_uuid_primary_key_to_task_instance_.py → ...add_uuid_primary_key_to_task_instance_.py
@@ -20,7 +20,7 @@
 Add UUID primary key to ``task_instance`` table.
 
 Revision ID: d59cbbef95eb
-Revises: 05234396c6fc
+Revises: c4a1639f0f67
 Create Date: 2024-10-21 22:39:12.394079
 """
 
@@ -33,7 +33,7 @@
 
 # revision identifiers, used by Alembic.
 revision = "d59cbbef95eb"
-down_revision = "05234396c6fc"
+down_revision = "c4a1639f0f67"
 branch_labels = "None"
 depends_on = None
 airflow_version = "3.0.0"

diff --git a/...043_3_0_0_remove_scheduler_lock_column.py → ...044_3_0_0_remove_scheduler_lock_column.py b/...043_3_0_0_remove_scheduler_lock_column.py → ...044_3_0_0_remove_scheduler_lock_column.py
diff --git a/...sions/0044_3_0_0__drop_task_fail_table.py → ...sions/0045_3_0_0__drop_task_fail_table.py b/...sions/0044_3_0_0__drop_task_fail_table.py → ...sions/0045_3_0_0__drop_task_fail_table.py
diff --git a/...0_add_last_heartbeat_at_directly_to_ti.py → ...0_add_last_heartbeat_at_directly_to_ti.py b/...0_add_last_heartbeat_at_directly_to_ti.py → ...0_add_last_heartbeat_at_directly_to_ti.py
diff --git a/.../versions/0046_3_0_0_drop_dag_pickling.py → .../versions/0047_3_0_0_drop_dag_pickling.py b/.../versions/0046_3_0_0_drop_dag_pickling.py → .../versions/0047_3_0_0_drop_dag_pickling.py
diff --git a/...versions/0047_3_0_0_add_dag_versioning.py → ...versions/0048_3_0_0_add_dag_versioning.py b/...versions/0047_3_0_0_add_dag_versioning.py → ...versions/0048_3_0_0_add_dag_versioning.py
@@ -131,6 +131,7 @@ def upgrade():
 
 def downgrade():
     """Unapply add dag versioning."""
+    _delete_serdag_and_code()
     with op.batch_alter_table("task_instance_history", schema=None) as batch_op:
         batch_op.drop_column("dag_version_id")
 

diff --git a/...0048_3_0_0_add_trigger_asset_reference.py → ...0049_3_0_0_add_trigger_asset_reference.py b/...0048_3_0_0_add_trigger_asset_reference.py → ...0049_3_0_0_add_trigger_asset_reference.py
diff --git a/..._0_remove_pickled_data_from_xcom_table.py → ..._0_remove_pickled_data_from_xcom_table.py b/..._0_remove_pickled_data_from_xcom_table.py → ..._0_remove_pickled_data_from_xcom_table.py
diff --git a/docs/apache-airflow/img/airflow_erd.sha256 b/docs/apache-airflow/img/airflow_erd.sha256
@@ -1 +1 @@
-b12f6811bb7a340362e4b8774b3bb81db28a7d0258564b3431bd537368554cc3
+7173ce2b98bc53467274ebe89bd3d4c8e7672f7b40b3f22989139ece45741f8f
diff --git a/docs/apache-airflow/migrations-ref.rst b/docs/apache-airflow/migrations-ref.rst
@@ -53,7 +53,9 @@ Here's the list of all the Database Migrations that are executed via when you ru
 +-------------------------+------------------+-------------------+--------------------------------------------------------------+
 | ``486ac7936b78``        | ``d59cbbef95eb`` | ``3.0.0``         | remove scheduler_lock column.                                |
 +-------------------------+------------------+-------------------+--------------------------------------------------------------+
-| ``d59cbbef95eb``        | ``05234396c6fc`` | ``3.0.0``         | Add UUID primary key to ``task_instance`` table.             |
+| ``d59cbbef95eb``        | ``c4a1639f0f67`` | ``3.0.0``         | Add UUID primary key to ``task_instance`` table.             |
++-------------------------+------------------+-------------------+--------------------------------------------------------------+
+| ``c4a1639f0f67``        | ``05234396c6fc`` | ``3.0.0``         | create foreign key constraints for assets.                   |
 +-------------------------+------------------+-------------------+--------------------------------------------------------------+
 | ``05234396c6fc``        | ``3a8972ecb8f9`` | ``3.0.0``         | Rename dataset as asset.                                     |
 +-------------------------+------------------+-------------------+--------------------------------------------------------------+
Original file line number	Diff line number	Diff line change
		@@ -1 +1 @@
		b12f6811bb7a340362e4b8774b3bb81db28a7d0258564b3431bd537368554cc3
		7173ce2b98bc53467274ebe89bd3d4c8e7672f7b40b3f22989139ece45741f8f