Sync DB Migrations with Airflow 2.1.3 (#17703)

Since apache/airflow#16401 was backported to Airflow 2.1.3, the order of DB migrations needs to be changed in the `main` branch as the other PRs with DB migrations weren't ported and would be released in 2.2. This PR sync the migrations to allow ugprade from 2.1.3 to 2.2 GitOrigin-RevId: 32475facce68a17d3e14d07762f63438e1527476
GoogleCloudPlatform · Dec 7, 2022 · 192a380 · 192a380
1 parent 86cf233
commit 192a380
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/airflow/migrations/versions/54bebd308c5f_add_trigger_table_and_task_info.py b/airflow/migrations/versions/54bebd308c5f_add_trigger_table_and_task_info.py
@@ -19,7 +19,7 @@
 """Add trigger table and task info
 
 Revision ID: 54bebd308c5f
-Revises: 97cdd93827b8
+Revises: 30867afad44a
 Create Date: 2021-04-14 12:56:40.688260
 
 """
@@ -31,7 +31,7 @@
 
 # revision identifiers, used by Alembic.
 revision = '54bebd308c5f'
-down_revision = '97cdd93827b8'
+down_revision = '30867afad44a'
 branch_labels = None
 depends_on = None
 

diff --git a/airflow/migrations/versions/83f031fd9f1c_improve_mssql_compatibility.py b/airflow/migrations/versions/83f031fd9f1c_improve_mssql_compatibility.py
@@ -19,7 +19,7 @@
 """improve mssql compatibility
 
 Revision ID: 83f031fd9f1c
-Revises: a13f7613ad25
+Revises: 97cdd93827b8
 Create Date: 2021-04-06 12:22:02.197726
 
 """
@@ -32,7 +32,7 @@
 
 # revision identifiers, used by Alembic.
 revision = '83f031fd9f1c'
-down_revision = 'a13f7613ad25'
+down_revision = '97cdd93827b8'
 branch_labels = None
 depends_on = None
 

diff --git a/airflow/migrations/versions/97cdd93827b8_add_queued_at_column_to_dagrun_table.py b/airflow/migrations/versions/97cdd93827b8_add_queued_at_column_to_dagrun_table.py
@@ -19,7 +19,7 @@
 """Add queued_at column to dagrun table
 
 Revision ID: 97cdd93827b8
-Revises: 30867afad44a
+Revises: a13f7613ad25
 Create Date: 2021-06-29 21:53:48.059438
 
 """
@@ -30,7 +30,7 @@
 
 # revision identifiers, used by Alembic.
 revision = '97cdd93827b8'
-down_revision = '30867afad44a'
+down_revision = 'a13f7613ad25'
 branch_labels = None
 depends_on = None
 

diff --git a/docs/apache-airflow/migrations-ref.rst b/docs/apache-airflow/migrations-ref.rst
@@ -25,15 +25,15 @@ Here's the list of all the Database Migrations that are executed via when you ru
 +--------------------------------+------------------+-----------------+---------------------------------------------------------------------------------------+
 | ``142555e44c17`` (head)        | ``54bebd308c5f`` |                 | Add ``data_interval_start`` and ``data_interval_end`` to ``DagRun``                   |
 +--------------------------------+------------------+-----------------+---------------------------------------------------------------------------------------+
-| ``54bebd308c5f``               | ``97cdd93827b8`` |                 | Adds ``trigger`` table and deferrable operator columns to task instance               |
-+--------------------------------+------------------+-----------------+---------------------------------------------------------------------------------------+
-| ``97cdd93827b8``               | ``30867afad44a`` |                 | Add ``queued_at`` column in ``dag_run`` table                                         |
+| ``54bebd308c5f``               | ``30867afad44a`` |                 | Adds ``trigger`` table and deferrable operator columns to task instance               |
 +--------------------------------+------------------+-----------------+---------------------------------------------------------------------------------------+
 | ``30867afad44a``               | ``e9304a3141f0`` |                 | Rename ``concurrency`` column in ``dag`` table to`` max_active_tasks``                |
 +--------------------------------+------------------+-----------------+---------------------------------------------------------------------------------------+
 | ``e9304a3141f0``               | ``83f031fd9f1c`` |                 | Make XCom primary key columns non-nullable                                            |
 +--------------------------------+------------------+-----------------+---------------------------------------------------------------------------------------+
-| ``83f031fd9f1c``               | ``a13f7613ad25`` |                 | Improve MSSQL compatibility                                                           |
+| ``83f031fd9f1c``               | ``97cdd93827b8`` |                 | Improve MSSQL compatibility                                                           |
++--------------------------------+------------------+-----------------+---------------------------------------------------------------------------------------+
+| ``97cdd93827b8``               | ``a13f7613ad25`` | ``2.1.3``       | Add ``queued_at`` column in ``dag_run`` table                                         |
 +--------------------------------+------------------+-----------------+---------------------------------------------------------------------------------------+
 | ``a13f7613ad25``               | ``e165e7455d70`` | ``2.1.0``       | Resource based permissions for default ``Flask-AppBuilder`` views                     |
 +--------------------------------+------------------+-----------------+---------------------------------------------------------------------------------------+