This is an automated email from the ASF dual-hosted git repository.

ephraimanierobi pushed a commit to branch v2-3-test
in repository https://gitbox.apache.org/repos/asf/airflow.git

commit bae9a1b2dd873a1a60926f12255bec62e9a3c64b
Author: Daniel Standish <15932138+dstand...@users.noreply.github.com>
AuthorDate: Mon May 16 14:13:53 2022 -0700

    Add version to migration prefix (#23564)
    
    We don't really need the alembic revision id in the filename.  having 
version instead is much more useful.  having both of them takes up too much 
space.
    
    (cherry picked from commit 741f8029115cc4698f9451b62546c3b1ff3d3a9c)
---
 CONTRIBUTING.rst                                   | 14 ++++++-
 ...rent_schema.py => 0001_1_5_0_current_schema.py} |  0
 ...rypted.py => 0002_1_5_0_create_is_encrypted.py} |  0
 ...tibility.py => 0003_1_5_0_for_compatibility.py} |  0
 ... 0004_1_5_0_more_logging_into_task_isntance.py} |  0
 ..._id_indices.py => 0005_1_5_2_job_id_indices.py} |  0
 ...to_log.py => 0006_1_6_0_adding_extra_to_log.py} |  0
 ...b76e_add_dagrun.py => 0007_1_6_0_add_dagrun.py} |  0
 ...ask_duration.py => 0008_1_6_0_task_duration.py} |  0
 ...agrun_config.py => 0009_1_6_0_dagrun_config.py} |  0
 ...y => 0010_1_6_2_add_password_column_to_user.py} |  0
 ...start_end.py => 0011_1_6_2_dagrun_start_end.py} |  0
 ..._0_add_notification_sent_column_to_sla_miss.py} |  0
 ...1_7_0_add_a_column_to_track_the_encryption_.py} |  0
 ..._1_7_0_add_is_encrypted_column_to_variable_.py} |  0
 ...er_table.py => 0015_1_7_1_rename_user_table.py} |  0
 ...e_index.py => 0016_1_7_1_add_ti_state_index.py} |  0
 ... => 0017_1_7_1_add_task_fails_journal_table.py} |  0
 ..._table.py => 0018_1_7_1_add_dag_stats_table.py} |  0
 ..._7_1_add_fractional_seconds_to_mysql_tables.py} |  0
 ...ices.py => 0020_1_7_1_xcom_dag_task_indices.py} |  0
 ...=> 0021_1_7_1_add_pid_field_to_taskinstance.py} |  0
 ...7_1_add_dag_id_state_index_on_dag_run_table.py} |  0
 ...1_8_2_add_max_tries_column_to_task_instance.py} |  0
 ...1_8_2_make_xcom_value_column_a_large_binary.py} |  0
 ..._index.py => 0025_1_8_2_add_ti_job_id_index.py} |  0
 ... => 0026_1_8_2_increase_text_size_for_mysql.py} |  0
 ...s.py => 0027_1_10_0_add_time_zone_awareness.py} |  0
 ..._10_0_add_kubernetes_resource_checkpointing.py} |  0
 ...1_10_0_add_executor_config_to_task_instance.py} |  0
 ..._1_10_0_add_kubernetes_scheduler_uniqueness.py} |  0
 ...6_merge_heads.py => 0031_1_10_0_merge_heads.py} |  0
 ...> 0032_1_10_0_fix_mysql_not_null_constraint.py} |  0
 ...ey.py => 0033_1_10_0_fix_sqlite_foreign_key.py} |  0
 ...x_taskfail.py => 0034_1_10_0_index_taskfail.py} |  0
 ...x_log_dag.py => 0035_1_10_2_add_idx_log_dag.py} |  0
 ...py => 0036_1_10_2_add_index_to_taskinstance.py} |  0
 ...py => 0037_1_10_2_add_task_reschedule_table.py} |  0
 ...ag_index.py => 0038_1_10_2_add_sm_dag_index.py} |  0
 ...field.py => 0039_1_10_2_add_superuser_field.py} |  0
 ..._to_dag.py => 0040_1_10_3_add_fields_to_dag.py} |  0
 ...=> 0041_1_10_3_add_schedule_interval_to_dag.py} |  0
 ...1_10_3_task_reschedule_fk_on_cascade_delete.py} |  0
 ..._1_10_4_make_taskinstance_pool_not_nullable.py} |  0
 ....py => 0044_1_10_7_add_serialized_dag_table.py} |  0
 ...ag.py => 0045_1_10_7_add_root_dag_id_to_dag.py} |  0
 ..._5_change_datetime_to_datetime2_6_on_mssql_.py} |  0
 ... 0047_1_10_4_increase_queue_name_size_limit.py} |  0
 ...ble.py => 0048_1_10_3_remove_dag_stat_table.py} |  0
 ...4_merge_heads.py => 0049_1_10_7_merge_heads.py} |  0
 ...0_7_increase_length_for_connection_password.py} |  0
 ...s_table.py => 0051_1_10_8_add_dagtags_table.py} |  0
 ...10_10_add_pool_slots_field_to_task_instance.py} |  0
 ..._10_add_rendered_task_instance_fields_table.py} |  0
 ...table.py => 0054_1_10_10_add_dag_code_table.py} |  0
 ...11_add_precision_to_execution_date_in_mysql.py} |  0
 ...0_12_add_dag_hash_column_to_serialized_dag_.py} |  0
 ...ab_tables.py => 0057_1_10_13_add_fab_tables.py} |  0
 ..._10_13_increase_length_of_fab_ab_view_menu_.py} |  0
 ..._chart.py => 0059_2_0_0_drop_user_and_chart.py} |  0
 ...py => 0060_2_0_0_remove_id_column_from_xcom.py} |  0
 ... => 0061_2_0_0_increase_length_of_pool_name.py} |  0
 ...n_type.py => 0062_2_0_0_add_dagrun_run_type.py} |  0
 ...=> 0063_2_0_0_set_conn_type_as_non_nullable.py} |  0
 ...0064_2_0_0_add_unique_constraint_to_conn_id.py} |  0
 ...> 0065_2_0_0_update_schema_for_smart_sensor.py} |  0
 ...py => 0066_2_0_0_add_queued_by_job_id_to_ti.py} |  0
 ...> 0067_2_0_0_add_external_executor_id_to_ti.py} |  0
 ...=> 0068_2_0_0_drop_kuberesourceversion_and_.py} |  0
 ..._0_0_add_scheduling_decision_to_dagrun_and_.py} |  0
 ..._fix_mssql_exec_date_rendered_task_instance.py} |  0
 ...py => 0071_2_0_0_add_job_id_to_dagrun_table.py} |  0
 ...72_2_0_0_add_k8s_yaml_to_rendered_templates.py} |  0
 ...ons.py => 0073_2_0_0_prefix_dag_permissions.py} |  0
 ...py => 0074_2_0_0_resource_based_permissions.py} |  0
 ...5_2_0_0_add_description_field_to_connection.py} |  0
 ...0_0_fix_description_field_in_connection_to_.py} |  0
 ..._0_0_change_field_in_dagcode_to_mediumtext_.py} |  0
 ...2_0_1_remove_can_read_permission_on_config_.py} |  0
 ..._2_increase_size_of_connection_extra_field_.py} |  0
 ...> 0080_2_0_2_change_default_pool_slots_to_1.py} |  0
 ...0081_2_0_2_rename_last_scheduler_run_column.py} |  0
 ...1_0_increase_pool_name_size_in_taskinstance.py} |  0
 ...083_2_1_0_add_description_field_to_variable.py} |  0
 ...1_0_resource_based_permissions_for_default_.py} |  0
 ..._2_1_3_add_queued_at_column_to_dagrun_table.py} |  0
 ...1_4_add_max_active_runs_column_to_dagmodel_.py} |  0
 ...2_1_4_add_index_on_state_dag_id_for_queued_.py} |  0
 ...y => 0088_2_2_0_improve_mssql_compatibility.py} |  0
 ...9_2_2_0_make_xcom_pkey_columns_non_nullable.py} |  0
 ...2_0_rename_concurrency_column_in_dag_table_.py} |  0
 ... 0091_2_2_0_add_trigger_table_and_task_info.py} |  0
 ...a_interval_start_end_to_dagmodel_and_dagrun.py} |  0
 ... => 0093_2_2_0_taskinstance_keyed_to_dagrun.py} |  0
 ..._3_add_has_import_errors_column_to_dagmodel.py} |  0
 ...db.py => 0095_2_2_4_add_session_table_to_db.py} |  0
 ...> 0096_2_2_4_adding_index_for_dag_id_in_job.py} |  0
 ...2_3_0_increase_length_of_email_and_username.py} |  0
 ...98_2_3_0_added_timetable_description_column.py} |  0
 ..._2_3_0_add_task_log_filename_template_model.py} |  0
 ..._3_0_add_taskmap_and_map_id_on_taskinstance.py} |  0
 ...2_3_0_add_data_compressed_to_serialized_dag.py} |  0
 ... 0102_2_3_0_switch_xcom_table_to_use_run_id.py} |  0
 ...py => 0103_2_3_0_add_callback_request_table.py} |  0
 ..._0_migrate_rtif_to_use_run_id_and_map_index.py} |  0
 ....py => 0105_2_3_0_add_map_index_to_taskfail.py} |  0
 ...n_for_fab_tables_to_add_missing_constraints.py} |  0
 ...o_log.py => 0107_2_3_0_add_map_index_to_log.py} |  0
 ...grid.py => 0108_2_3_0_default_dag_view_grid.py} |  0
 ...py => 0109_2_3_1_add_index_for_event_in_log.py} |  0
 scripts/in_container/run_migration_reference.py    | 47 +++++++++++++++++-----
 111 files changed, 50 insertions(+), 11 deletions(-)

diff --git a/CONTRIBUTING.rst b/CONTRIBUTING.rst
index e0e58a8bf7..f862d33b19 100644
--- a/CONTRIBUTING.rst
+++ b/CONTRIBUTING.rst
@@ -1166,8 +1166,20 @@ development machine before continuing with migration.
     $ cd airflow
     $ alembic revision -m "add new field to db"
        Generating
-    ~/airflow/airflow/migrations/versions/12341123_add_new_field_to_db.py
+    ~/airflow/airflow/migrations/versions/a1e23c41f123_add_new_field_to_db.py
 
+Note that migration file names are standardized by pre-commit hook 
``update-migration-references``, so that they sort alphabetically and indicate
+the Airflow version in which they first appear (the alembic revision ID is 
removed). As a result you should expect to see a pre-commit failure
+on the first attempt.  Just stage the modified file and commit again
+(or run the hook manually before committing).
+
+After your new migration file is run through pre-commit it will look like this:
+
+.. code-block::
+
+    1234_A_B_C_add_new_field_to_db.py
+
+This represents that your migration is the 1234th migration and expected for 
release in Airflow version A.B.C.
 
 Node.js Environment Setup
 =========================
diff --git a/airflow/migrations/versions/0001_e3a246e0dc1_current_schema.py 
b/airflow/migrations/versions/0001_1_5_0_current_schema.py
similarity index 100%
rename from airflow/migrations/versions/0001_e3a246e0dc1_current_schema.py
rename to airflow/migrations/versions/0001_1_5_0_current_schema.py
diff --git 
a/airflow/migrations/versions/0002_1507a7289a2f_create_is_encrypted.py 
b/airflow/migrations/versions/0002_1_5_0_create_is_encrypted.py
similarity index 100%
rename from airflow/migrations/versions/0002_1507a7289a2f_create_is_encrypted.py
rename to airflow/migrations/versions/0002_1_5_0_create_is_encrypted.py
diff --git a/airflow/migrations/versions/0003_13eb55f81627_for_compatibility.py 
b/airflow/migrations/versions/0003_1_5_0_for_compatibility.py
similarity index 100%
rename from airflow/migrations/versions/0003_13eb55f81627_for_compatibility.py
rename to airflow/migrations/versions/0003_1_5_0_for_compatibility.py
diff --git 
a/airflow/migrations/versions/0004_338e90f54d61_more_logging_into_task_isntance.py
 b/airflow/migrations/versions/0004_1_5_0_more_logging_into_task_isntance.py
similarity index 100%
rename from 
airflow/migrations/versions/0004_338e90f54d61_more_logging_into_task_isntance.py
rename to 
airflow/migrations/versions/0004_1_5_0_more_logging_into_task_isntance.py
diff --git a/airflow/migrations/versions/0005_52d714495f0_job_id_indices.py 
b/airflow/migrations/versions/0005_1_5_2_job_id_indices.py
similarity index 100%
rename from airflow/migrations/versions/0005_52d714495f0_job_id_indices.py
rename to airflow/migrations/versions/0005_1_5_2_job_id_indices.py
diff --git 
a/airflow/migrations/versions/0006_502898887f84_adding_extra_to_log.py 
b/airflow/migrations/versions/0006_1_6_0_adding_extra_to_log.py
similarity index 100%
rename from airflow/migrations/versions/0006_502898887f84_adding_extra_to_log.py
rename to airflow/migrations/versions/0006_1_6_0_adding_extra_to_log.py
diff --git a/airflow/migrations/versions/0007_1b38cef5b76e_add_dagrun.py 
b/airflow/migrations/versions/0007_1_6_0_add_dagrun.py
similarity index 100%
rename from airflow/migrations/versions/0007_1b38cef5b76e_add_dagrun.py
rename to airflow/migrations/versions/0007_1_6_0_add_dagrun.py
diff --git a/airflow/migrations/versions/0008_2e541a1dcfed_task_duration.py 
b/airflow/migrations/versions/0008_1_6_0_task_duration.py
similarity index 100%
rename from airflow/migrations/versions/0008_2e541a1dcfed_task_duration.py
rename to airflow/migrations/versions/0008_1_6_0_task_duration.py
diff --git a/airflow/migrations/versions/0009_40e67319e3a9_dagrun_config.py 
b/airflow/migrations/versions/0009_1_6_0_dagrun_config.py
similarity index 100%
rename from airflow/migrations/versions/0009_40e67319e3a9_dagrun_config.py
rename to airflow/migrations/versions/0009_1_6_0_dagrun_config.py
diff --git 
a/airflow/migrations/versions/0010_561833c1c74b_add_password_column_to_user.py 
b/airflow/migrations/versions/0010_1_6_2_add_password_column_to_user.py
similarity index 100%
rename from 
airflow/migrations/versions/0010_561833c1c74b_add_password_column_to_user.py
rename to airflow/migrations/versions/0010_1_6_2_add_password_column_to_user.py
diff --git a/airflow/migrations/versions/0011_4446e08588_dagrun_start_end.py 
b/airflow/migrations/versions/0011_1_6_2_dagrun_start_end.py
similarity index 100%
rename from airflow/migrations/versions/0011_4446e08588_dagrun_start_end.py
rename to airflow/migrations/versions/0011_1_6_2_dagrun_start_end.py
diff --git 
a/airflow/migrations/versions/0012_bbc73705a13e_add_notification_sent_column_to_sla_miss.py
 
b/airflow/migrations/versions/0012_1_7_0_add_notification_sent_column_to_sla_miss.py
similarity index 100%
rename from 
airflow/migrations/versions/0012_bbc73705a13e_add_notification_sent_column_to_sla_miss.py
rename to 
airflow/migrations/versions/0012_1_7_0_add_notification_sent_column_to_sla_miss.py
diff --git 
a/airflow/migrations/versions/0013_bba5a7cfc896_add_a_column_to_track_the_encryption_.py
 
b/airflow/migrations/versions/0013_1_7_0_add_a_column_to_track_the_encryption_.py
similarity index 100%
rename from 
airflow/migrations/versions/0013_bba5a7cfc896_add_a_column_to_track_the_encryption_.py
rename to 
airflow/migrations/versions/0013_1_7_0_add_a_column_to_track_the_encryption_.py
diff --git 
a/airflow/migrations/versions/0014_1968acfc09e3_add_is_encrypted_column_to_variable_.py
 
b/airflow/migrations/versions/0014_1_7_0_add_is_encrypted_column_to_variable_.py
similarity index 100%
rename from 
airflow/migrations/versions/0014_1968acfc09e3_add_is_encrypted_column_to_variable_.py
rename to 
airflow/migrations/versions/0014_1_7_0_add_is_encrypted_column_to_variable_.py
diff --git a/airflow/migrations/versions/0015_2e82aab8ef20_rename_user_table.py 
b/airflow/migrations/versions/0015_1_7_1_rename_user_table.py
similarity index 100%
rename from airflow/migrations/versions/0015_2e82aab8ef20_rename_user_table.py
rename to airflow/migrations/versions/0015_1_7_1_rename_user_table.py
diff --git 
a/airflow/migrations/versions/0016_211e584da130_add_ti_state_index.py 
b/airflow/migrations/versions/0016_1_7_1_add_ti_state_index.py
similarity index 100%
rename from airflow/migrations/versions/0016_211e584da130_add_ti_state_index.py
rename to airflow/migrations/versions/0016_1_7_1_add_ti_state_index.py
diff --git 
a/airflow/migrations/versions/0017_64de9cddf6c9_add_task_fails_journal_table.py 
b/airflow/migrations/versions/0017_1_7_1_add_task_fails_journal_table.py
similarity index 100%
rename from 
airflow/migrations/versions/0017_64de9cddf6c9_add_task_fails_journal_table.py
rename to airflow/migrations/versions/0017_1_7_1_add_task_fails_journal_table.py
diff --git 
a/airflow/migrations/versions/0018_f2ca10b85618_add_dag_stats_table.py 
b/airflow/migrations/versions/0018_1_7_1_add_dag_stats_table.py
similarity index 100%
rename from airflow/migrations/versions/0018_f2ca10b85618_add_dag_stats_table.py
rename to airflow/migrations/versions/0018_1_7_1_add_dag_stats_table.py
diff --git 
a/airflow/migrations/versions/0019_4addfa1236f1_add_fractional_seconds_to_mysql_tables.py
 
b/airflow/migrations/versions/0019_1_7_1_add_fractional_seconds_to_mysql_tables.py
similarity index 100%
rename from 
airflow/migrations/versions/0019_4addfa1236f1_add_fractional_seconds_to_mysql_tables.py
rename to 
airflow/migrations/versions/0019_1_7_1_add_fractional_seconds_to_mysql_tables.py
diff --git 
a/airflow/migrations/versions/0020_8504051e801b_xcom_dag_task_indices.py 
b/airflow/migrations/versions/0020_1_7_1_xcom_dag_task_indices.py
similarity index 100%
rename from 
airflow/migrations/versions/0020_8504051e801b_xcom_dag_task_indices.py
rename to airflow/migrations/versions/0020_1_7_1_xcom_dag_task_indices.py
diff --git 
a/airflow/migrations/versions/0021_5e7d17757c7a_add_pid_field_to_taskinstance.py
 b/airflow/migrations/versions/0021_1_7_1_add_pid_field_to_taskinstance.py
similarity index 100%
rename from 
airflow/migrations/versions/0021_5e7d17757c7a_add_pid_field_to_taskinstance.py
rename to 
airflow/migrations/versions/0021_1_7_1_add_pid_field_to_taskinstance.py
diff --git 
a/airflow/migrations/versions/0022_127d2bf2dfa7_add_dag_id_state_index_on_dag_run_table.py
 
b/airflow/migrations/versions/0022_1_7_1_add_dag_id_state_index_on_dag_run_table.py
similarity index 100%
rename from 
airflow/migrations/versions/0022_127d2bf2dfa7_add_dag_id_state_index_on_dag_run_table.py
rename to 
airflow/migrations/versions/0022_1_7_1_add_dag_id_state_index_on_dag_run_table.py
diff --git 
a/airflow/migrations/versions/0023_cc1e65623dc7_add_max_tries_column_to_task_instance.py
 
b/airflow/migrations/versions/0023_1_8_2_add_max_tries_column_to_task_instance.py
similarity index 100%
rename from 
airflow/migrations/versions/0023_cc1e65623dc7_add_max_tries_column_to_task_instance.py
rename to 
airflow/migrations/versions/0023_1_8_2_add_max_tries_column_to_task_instance.py
diff --git 
a/airflow/migrations/versions/0024_bdaa763e6c56_make_xcom_value_column_a_large_binary.py
 
b/airflow/migrations/versions/0024_1_8_2_make_xcom_value_column_a_large_binary.py
similarity index 100%
rename from 
airflow/migrations/versions/0024_bdaa763e6c56_make_xcom_value_column_a_large_binary.py
rename to 
airflow/migrations/versions/0024_1_8_2_make_xcom_value_column_a_large_binary.py
diff --git 
a/airflow/migrations/versions/0025_947454bf1dff_add_ti_job_id_index.py 
b/airflow/migrations/versions/0025_1_8_2_add_ti_job_id_index.py
similarity index 100%
rename from airflow/migrations/versions/0025_947454bf1dff_add_ti_job_id_index.py
rename to airflow/migrations/versions/0025_1_8_2_add_ti_job_id_index.py
diff --git 
a/airflow/migrations/versions/0026_d2ae31099d61_increase_text_size_for_mysql.py 
b/airflow/migrations/versions/0026_1_8_2_increase_text_size_for_mysql.py
similarity index 100%
rename from 
airflow/migrations/versions/0026_d2ae31099d61_increase_text_size_for_mysql.py
rename to airflow/migrations/versions/0026_1_8_2_increase_text_size_for_mysql.py
diff --git 
a/airflow/migrations/versions/0027_0e2a74e0fc9f_add_time_zone_awareness.py 
b/airflow/migrations/versions/0027_1_10_0_add_time_zone_awareness.py
similarity index 100%
rename from 
airflow/migrations/versions/0027_0e2a74e0fc9f_add_time_zone_awareness.py
rename to airflow/migrations/versions/0027_1_10_0_add_time_zone_awareness.py
diff --git 
a/airflow/migrations/versions/0028_33ae817a1ff4_add_kubernetes_resource_checkpointing.py
 
b/airflow/migrations/versions/0028_1_10_0_add_kubernetes_resource_checkpointing.py
similarity index 100%
rename from 
airflow/migrations/versions/0028_33ae817a1ff4_add_kubernetes_resource_checkpointing.py
rename to 
airflow/migrations/versions/0028_1_10_0_add_kubernetes_resource_checkpointing.py
diff --git 
a/airflow/migrations/versions/0029_27c6a30d7c24_add_executor_config_to_task_instance.py
 
b/airflow/migrations/versions/0029_1_10_0_add_executor_config_to_task_instance.py
similarity index 100%
rename from 
airflow/migrations/versions/0029_27c6a30d7c24_add_executor_config_to_task_instance.py
rename to 
airflow/migrations/versions/0029_1_10_0_add_executor_config_to_task_instance.py
diff --git 
a/airflow/migrations/versions/0030_86770d1215c0_add_kubernetes_scheduler_uniqueness.py
 
b/airflow/migrations/versions/0030_1_10_0_add_kubernetes_scheduler_uniqueness.py
similarity index 100%
rename from 
airflow/migrations/versions/0030_86770d1215c0_add_kubernetes_scheduler_uniqueness.py
rename to 
airflow/migrations/versions/0030_1_10_0_add_kubernetes_scheduler_uniqueness.py
diff --git a/airflow/migrations/versions/0031_05f30312d566_merge_heads.py 
b/airflow/migrations/versions/0031_1_10_0_merge_heads.py
similarity index 100%
rename from airflow/migrations/versions/0031_05f30312d566_merge_heads.py
rename to airflow/migrations/versions/0031_1_10_0_merge_heads.py
diff --git 
a/airflow/migrations/versions/0032_f23433877c24_fix_mysql_not_null_constraint.py
 b/airflow/migrations/versions/0032_1_10_0_fix_mysql_not_null_constraint.py
similarity index 100%
rename from 
airflow/migrations/versions/0032_f23433877c24_fix_mysql_not_null_constraint.py
rename to 
airflow/migrations/versions/0032_1_10_0_fix_mysql_not_null_constraint.py
diff --git 
a/airflow/migrations/versions/0033_856955da8476_fix_sqlite_foreign_key.py 
b/airflow/migrations/versions/0033_1_10_0_fix_sqlite_foreign_key.py
similarity index 100%
rename from 
airflow/migrations/versions/0033_856955da8476_fix_sqlite_foreign_key.py
rename to airflow/migrations/versions/0033_1_10_0_fix_sqlite_foreign_key.py
diff --git a/airflow/migrations/versions/0034_9635ae0956e7_index_taskfail.py 
b/airflow/migrations/versions/0034_1_10_0_index_taskfail.py
similarity index 100%
rename from airflow/migrations/versions/0034_9635ae0956e7_index_taskfail.py
rename to airflow/migrations/versions/0034_1_10_0_index_taskfail.py
diff --git a/airflow/migrations/versions/0035_dd25f486b8ea_add_idx_log_dag.py 
b/airflow/migrations/versions/0035_1_10_2_add_idx_log_dag.py
similarity index 100%
rename from airflow/migrations/versions/0035_dd25f486b8ea_add_idx_log_dag.py
rename to airflow/migrations/versions/0035_1_10_2_add_idx_log_dag.py
diff --git 
a/airflow/migrations/versions/0036_bf00311e1990_add_index_to_taskinstance.py 
b/airflow/migrations/versions/0036_1_10_2_add_index_to_taskinstance.py
similarity index 100%
rename from 
airflow/migrations/versions/0036_bf00311e1990_add_index_to_taskinstance.py
rename to airflow/migrations/versions/0036_1_10_2_add_index_to_taskinstance.py
diff --git 
a/airflow/migrations/versions/0037_0a2a5b66e19d_add_task_reschedule_table.py 
b/airflow/migrations/versions/0037_1_10_2_add_task_reschedule_table.py
similarity index 100%
rename from 
airflow/migrations/versions/0037_0a2a5b66e19d_add_task_reschedule_table.py
rename to airflow/migrations/versions/0037_1_10_2_add_task_reschedule_table.py
diff --git a/airflow/migrations/versions/0038_03bc53e68815_add_sm_dag_index.py 
b/airflow/migrations/versions/0038_1_10_2_add_sm_dag_index.py
similarity index 100%
rename from airflow/migrations/versions/0038_03bc53e68815_add_sm_dag_index.py
rename to airflow/migrations/versions/0038_1_10_2_add_sm_dag_index.py
diff --git 
a/airflow/migrations/versions/0039_41f5f12752f8_add_superuser_field.py 
b/airflow/migrations/versions/0039_1_10_2_add_superuser_field.py
similarity index 100%
rename from airflow/migrations/versions/0039_41f5f12752f8_add_superuser_field.py
rename to airflow/migrations/versions/0039_1_10_2_add_superuser_field.py
diff --git a/airflow/migrations/versions/0040_c8ffec048a3b_add_fields_to_dag.py 
b/airflow/migrations/versions/0040_1_10_3_add_fields_to_dag.py
similarity index 100%
rename from airflow/migrations/versions/0040_c8ffec048a3b_add_fields_to_dag.py
rename to airflow/migrations/versions/0040_1_10_3_add_fields_to_dag.py
diff --git 
a/airflow/migrations/versions/0041_dd4ecb8fbee3_add_schedule_interval_to_dag.py 
b/airflow/migrations/versions/0041_1_10_3_add_schedule_interval_to_dag.py
similarity index 100%
rename from 
airflow/migrations/versions/0041_dd4ecb8fbee3_add_schedule_interval_to_dag.py
rename to 
airflow/migrations/versions/0041_1_10_3_add_schedule_interval_to_dag.py
diff --git 
a/airflow/migrations/versions/0042_939bb1e647c8_task_reschedule_fk_on_cascade_delete.py
 
b/airflow/migrations/versions/0042_1_10_3_task_reschedule_fk_on_cascade_delete.py
similarity index 100%
rename from 
airflow/migrations/versions/0042_939bb1e647c8_task_reschedule_fk_on_cascade_delete.py
rename to 
airflow/migrations/versions/0042_1_10_3_task_reschedule_fk_on_cascade_delete.py
diff --git 
a/airflow/migrations/versions/0043_6e96a59344a4_make_taskinstance_pool_not_nullable.py
 
b/airflow/migrations/versions/0043_1_10_4_make_taskinstance_pool_not_nullable.py
similarity index 100%
rename from 
airflow/migrations/versions/0043_6e96a59344a4_make_taskinstance_pool_not_nullable.py
rename to 
airflow/migrations/versions/0043_1_10_4_make_taskinstance_pool_not_nullable.py
diff --git 
a/airflow/migrations/versions/0044_d38e04c12aa2_add_serialized_dag_table.py 
b/airflow/migrations/versions/0044_1_10_7_add_serialized_dag_table.py
similarity index 100%
rename from 
airflow/migrations/versions/0044_d38e04c12aa2_add_serialized_dag_table.py
rename to airflow/migrations/versions/0044_1_10_7_add_serialized_dag_table.py
diff --git 
a/airflow/migrations/versions/0045_b3b105409875_add_root_dag_id_to_dag.py 
b/airflow/migrations/versions/0045_1_10_7_add_root_dag_id_to_dag.py
similarity index 100%
rename from 
airflow/migrations/versions/0045_b3b105409875_add_root_dag_id_to_dag.py
rename to airflow/migrations/versions/0045_1_10_7_add_root_dag_id_to_dag.py
diff --git 
a/airflow/migrations/versions/0046_74effc47d867_change_datetime_to_datetime2_6_on_mssql_.py
 
b/airflow/migrations/versions/0046_1_10_5_change_datetime_to_datetime2_6_on_mssql_.py
similarity index 100%
rename from 
airflow/migrations/versions/0046_74effc47d867_change_datetime_to_datetime2_6_on_mssql_.py
rename to 
airflow/migrations/versions/0046_1_10_5_change_datetime_to_datetime2_6_on_mssql_.py
diff --git 
a/airflow/migrations/versions/0047_004c1210f153_increase_queue_name_size_limit.py
 b/airflow/migrations/versions/0047_1_10_4_increase_queue_name_size_limit.py
similarity index 100%
rename from 
airflow/migrations/versions/0047_004c1210f153_increase_queue_name_size_limit.py
rename to 
airflow/migrations/versions/0047_1_10_4_increase_queue_name_size_limit.py
diff --git 
a/airflow/migrations/versions/0048_a56c9515abdc_remove_dag_stat_table.py 
b/airflow/migrations/versions/0048_1_10_3_remove_dag_stat_table.py
similarity index 100%
rename from 
airflow/migrations/versions/0048_a56c9515abdc_remove_dag_stat_table.py
rename to airflow/migrations/versions/0048_1_10_3_remove_dag_stat_table.py
diff --git a/airflow/migrations/versions/0049_08364691d074_merge_heads.py 
b/airflow/migrations/versions/0049_1_10_7_merge_heads.py
similarity index 100%
rename from airflow/migrations/versions/0049_08364691d074_merge_heads.py
rename to airflow/migrations/versions/0049_1_10_7_merge_heads.py
diff --git 
a/airflow/migrations/versions/0050_fe461863935f_increase_length_for_connection_password.py
 
b/airflow/migrations/versions/0050_1_10_7_increase_length_for_connection_password.py
similarity index 100%
rename from 
airflow/migrations/versions/0050_fe461863935f_increase_length_for_connection_password.py
rename to 
airflow/migrations/versions/0050_1_10_7_increase_length_for_connection_password.py
diff --git a/airflow/migrations/versions/0051_7939bcff74ba_add_dagtags_table.py 
b/airflow/migrations/versions/0051_1_10_8_add_dagtags_table.py
similarity index 100%
rename from airflow/migrations/versions/0051_7939bcff74ba_add_dagtags_table.py
rename to airflow/migrations/versions/0051_1_10_8_add_dagtags_table.py
diff --git 
a/airflow/migrations/versions/0052_a4c2fd67d16b_add_pool_slots_field_to_task_instance.py
 
b/airflow/migrations/versions/0052_1_10_10_add_pool_slots_field_to_task_instance.py
similarity index 100%
rename from 
airflow/migrations/versions/0052_a4c2fd67d16b_add_pool_slots_field_to_task_instance.py
rename to 
airflow/migrations/versions/0052_1_10_10_add_pool_slots_field_to_task_instance.py
diff --git 
a/airflow/migrations/versions/0053_852ae6c715af_add_rendered_task_instance_fields_table.py
 
b/airflow/migrations/versions/0053_1_10_10_add_rendered_task_instance_fields_table.py
similarity index 100%
rename from 
airflow/migrations/versions/0053_852ae6c715af_add_rendered_task_instance_fields_table.py
rename to 
airflow/migrations/versions/0053_1_10_10_add_rendered_task_instance_fields_table.py
diff --git 
a/airflow/migrations/versions/0054_952da73b5eff_add_dag_code_table.py 
b/airflow/migrations/versions/0054_1_10_10_add_dag_code_table.py
similarity index 100%
rename from airflow/migrations/versions/0054_952da73b5eff_add_dag_code_table.py
rename to airflow/migrations/versions/0054_1_10_10_add_dag_code_table.py
diff --git 
a/airflow/migrations/versions/0055_a66efa278eea_add_precision_to_execution_date_in_mysql.py
 
b/airflow/migrations/versions/0055_1_10_11_add_precision_to_execution_date_in_mysql.py
similarity index 100%
rename from 
airflow/migrations/versions/0055_a66efa278eea_add_precision_to_execution_date_in_mysql.py
rename to 
airflow/migrations/versions/0055_1_10_11_add_precision_to_execution_date_in_mysql.py
diff --git 
a/airflow/migrations/versions/0056_da3f683c3a5a_add_dag_hash_column_to_serialized_dag_.py
 
b/airflow/migrations/versions/0056_1_10_12_add_dag_hash_column_to_serialized_dag_.py
similarity index 100%
rename from 
airflow/migrations/versions/0056_da3f683c3a5a_add_dag_hash_column_to_serialized_dag_.py
rename to 
airflow/migrations/versions/0056_1_10_12_add_dag_hash_column_to_serialized_dag_.py
diff --git a/airflow/migrations/versions/0057_92c57b58940d_add_fab_tables.py 
b/airflow/migrations/versions/0057_1_10_13_add_fab_tables.py
similarity index 100%
rename from airflow/migrations/versions/0057_92c57b58940d_add_fab_tables.py
rename to airflow/migrations/versions/0057_1_10_13_add_fab_tables.py
diff --git 
a/airflow/migrations/versions/0058_03afc6b6f902_increase_length_of_fab_ab_view_menu_.py
 
b/airflow/migrations/versions/0058_1_10_13_increase_length_of_fab_ab_view_menu_.py
similarity index 100%
rename from 
airflow/migrations/versions/0058_03afc6b6f902_increase_length_of_fab_ab_view_menu_.py
rename to 
airflow/migrations/versions/0058_1_10_13_increase_length_of_fab_ab_view_menu_.py
diff --git 
a/airflow/migrations/versions/0059_cf5dc11e79ad_drop_user_and_chart.py 
b/airflow/migrations/versions/0059_2_0_0_drop_user_and_chart.py
similarity index 100%
rename from airflow/migrations/versions/0059_cf5dc11e79ad_drop_user_and_chart.py
rename to airflow/migrations/versions/0059_2_0_0_drop_user_and_chart.py
diff --git 
a/airflow/migrations/versions/0060_bbf4a7ad0465_remove_id_column_from_xcom.py 
b/airflow/migrations/versions/0060_2_0_0_remove_id_column_from_xcom.py
similarity index 100%
rename from 
airflow/migrations/versions/0060_bbf4a7ad0465_remove_id_column_from_xcom.py
rename to airflow/migrations/versions/0060_2_0_0_remove_id_column_from_xcom.py
diff --git 
a/airflow/migrations/versions/0061_b25a55525161_increase_length_of_pool_name.py 
b/airflow/migrations/versions/0061_2_0_0_increase_length_of_pool_name.py
similarity index 100%
rename from 
airflow/migrations/versions/0061_b25a55525161_increase_length_of_pool_name.py
rename to airflow/migrations/versions/0061_2_0_0_increase_length_of_pool_name.py
diff --git 
a/airflow/migrations/versions/0062_3c20cacc0044_add_dagrun_run_type.py 
b/airflow/migrations/versions/0062_2_0_0_add_dagrun_run_type.py
similarity index 100%
rename from airflow/migrations/versions/0062_3c20cacc0044_add_dagrun_run_type.py
rename to airflow/migrations/versions/0062_2_0_0_add_dagrun_run_type.py
diff --git 
a/airflow/migrations/versions/0063_8f966b9c467a_set_conn_type_as_non_nullable.py
 b/airflow/migrations/versions/0063_2_0_0_set_conn_type_as_non_nullable.py
similarity index 100%
rename from 
airflow/migrations/versions/0063_8f966b9c467a_set_conn_type_as_non_nullable.py
rename to 
airflow/migrations/versions/0063_2_0_0_set_conn_type_as_non_nullable.py
diff --git 
a/airflow/migrations/versions/0064_8d48763f6d53_add_unique_constraint_to_conn_id.py
 b/airflow/migrations/versions/0064_2_0_0_add_unique_constraint_to_conn_id.py
similarity index 100%
rename from 
airflow/migrations/versions/0064_8d48763f6d53_add_unique_constraint_to_conn_id.py
rename to 
airflow/migrations/versions/0064_2_0_0_add_unique_constraint_to_conn_id.py
diff --git 
a/airflow/migrations/versions/0065_e38be357a868_update_schema_for_smart_sensor.py
 b/airflow/migrations/versions/0065_2_0_0_update_schema_for_smart_sensor.py
similarity index 100%
rename from 
airflow/migrations/versions/0065_e38be357a868_update_schema_for_smart_sensor.py
rename to 
airflow/migrations/versions/0065_2_0_0_update_schema_for_smart_sensor.py
diff --git 
a/airflow/migrations/versions/0066_b247b1e3d1ed_add_queued_by_job_id_to_ti.py 
b/airflow/migrations/versions/0066_2_0_0_add_queued_by_job_id_to_ti.py
similarity index 100%
rename from 
airflow/migrations/versions/0066_b247b1e3d1ed_add_queued_by_job_id_to_ti.py
rename to airflow/migrations/versions/0066_2_0_0_add_queued_by_job_id_to_ti.py
diff --git 
a/airflow/migrations/versions/0067_e1a11ece99cc_add_external_executor_id_to_ti.py
 b/airflow/migrations/versions/0067_2_0_0_add_external_executor_id_to_ti.py
similarity index 100%
rename from 
airflow/migrations/versions/0067_e1a11ece99cc_add_external_executor_id_to_ti.py
rename to 
airflow/migrations/versions/0067_2_0_0_add_external_executor_id_to_ti.py
diff --git 
a/airflow/migrations/versions/0068_bef4f3d11e8b_drop_kuberesourceversion_and_.py
 b/airflow/migrations/versions/0068_2_0_0_drop_kuberesourceversion_and_.py
similarity index 100%
rename from 
airflow/migrations/versions/0068_bef4f3d11e8b_drop_kuberesourceversion_and_.py
rename to 
airflow/migrations/versions/0068_2_0_0_drop_kuberesourceversion_and_.py
diff --git 
a/airflow/migrations/versions/0069_98271e7606e2_add_scheduling_decision_to_dagrun_and_.py
 
b/airflow/migrations/versions/0069_2_0_0_add_scheduling_decision_to_dagrun_and_.py
similarity index 100%
rename from 
airflow/migrations/versions/0069_98271e7606e2_add_scheduling_decision_to_dagrun_and_.py
rename to 
airflow/migrations/versions/0069_2_0_0_add_scheduling_decision_to_dagrun_and_.py
diff --git 
a/airflow/migrations/versions/0070_52d53670a240_fix_mssql_exec_date_rendered_task_instance.py
 
b/airflow/migrations/versions/0070_2_0_0_fix_mssql_exec_date_rendered_task_instance.py
similarity index 100%
rename from 
airflow/migrations/versions/0070_52d53670a240_fix_mssql_exec_date_rendered_task_instance.py
rename to 
airflow/migrations/versions/0070_2_0_0_fix_mssql_exec_date_rendered_task_instance.py
diff --git 
a/airflow/migrations/versions/0071_364159666cbd_add_job_id_to_dagrun_table.py 
b/airflow/migrations/versions/0071_2_0_0_add_job_id_to_dagrun_table.py
similarity index 100%
rename from 
airflow/migrations/versions/0071_364159666cbd_add_job_id_to_dagrun_table.py
rename to airflow/migrations/versions/0071_2_0_0_add_job_id_to_dagrun_table.py
diff --git 
a/airflow/migrations/versions/0072_45ba3f1493b9_add_k8s_yaml_to_rendered_templates.py
 b/airflow/migrations/versions/0072_2_0_0_add_k8s_yaml_to_rendered_templates.py
similarity index 100%
rename from 
airflow/migrations/versions/0072_45ba3f1493b9_add_k8s_yaml_to_rendered_templates.py
rename to 
airflow/migrations/versions/0072_2_0_0_add_k8s_yaml_to_rendered_templates.py
diff --git 
a/airflow/migrations/versions/0073_849da589634d_prefix_dag_permissions.py 
b/airflow/migrations/versions/0073_2_0_0_prefix_dag_permissions.py
similarity index 100%
rename from 
airflow/migrations/versions/0073_849da589634d_prefix_dag_permissions.py
rename to airflow/migrations/versions/0073_2_0_0_prefix_dag_permissions.py
diff --git 
a/airflow/migrations/versions/0074_2c6edca13270_resource_based_permissions.py 
b/airflow/migrations/versions/0074_2_0_0_resource_based_permissions.py
similarity index 100%
rename from 
airflow/migrations/versions/0074_2c6edca13270_resource_based_permissions.py
rename to airflow/migrations/versions/0074_2_0_0_resource_based_permissions.py
diff --git 
a/airflow/migrations/versions/0075_61ec73d9401f_add_description_field_to_connection.py
 b/airflow/migrations/versions/0075_2_0_0_add_description_field_to_connection.py
similarity index 100%
rename from 
airflow/migrations/versions/0075_61ec73d9401f_add_description_field_to_connection.py
rename to 
airflow/migrations/versions/0075_2_0_0_add_description_field_to_connection.py
diff --git 
a/airflow/migrations/versions/0076_64a7d6477aae_fix_description_field_in_connection_to_.py
 
b/airflow/migrations/versions/0076_2_0_0_fix_description_field_in_connection_to_.py
similarity index 100%
rename from 
airflow/migrations/versions/0076_64a7d6477aae_fix_description_field_in_connection_to_.py
rename to 
airflow/migrations/versions/0076_2_0_0_fix_description_field_in_connection_to_.py
diff --git 
a/airflow/migrations/versions/0077_e959f08ac86c_change_field_in_dagcode_to_mediumtext_.py
 
b/airflow/migrations/versions/0077_2_0_0_change_field_in_dagcode_to_mediumtext_.py
similarity index 100%
rename from 
airflow/migrations/versions/0077_e959f08ac86c_change_field_in_dagcode_to_mediumtext_.py
rename to 
airflow/migrations/versions/0077_2_0_0_change_field_in_dagcode_to_mediumtext_.py
diff --git 
a/airflow/migrations/versions/0078_82b7c48c147f_remove_can_read_permission_on_config_.py
 
b/airflow/migrations/versions/0078_2_0_1_remove_can_read_permission_on_config_.py
similarity index 100%
rename from 
airflow/migrations/versions/0078_82b7c48c147f_remove_can_read_permission_on_config_.py
rename to 
airflow/migrations/versions/0078_2_0_1_remove_can_read_permission_on_config_.py
diff --git 
a/airflow/migrations/versions/0079_449b4072c2da_increase_size_of_connection_extra_field_.py
 
b/airflow/migrations/versions/0079_2_0_2_increase_size_of_connection_extra_field_.py
similarity index 100%
rename from 
airflow/migrations/versions/0079_449b4072c2da_increase_size_of_connection_extra_field_.py
rename to 
airflow/migrations/versions/0079_2_0_2_increase_size_of_connection_extra_field_.py
diff --git 
a/airflow/migrations/versions/0080_8646922c8a04_change_default_pool_slots_to_1.py
 b/airflow/migrations/versions/0080_2_0_2_change_default_pool_slots_to_1.py
similarity index 100%
rename from 
airflow/migrations/versions/0080_8646922c8a04_change_default_pool_slots_to_1.py
rename to 
airflow/migrations/versions/0080_2_0_2_change_default_pool_slots_to_1.py
diff --git 
a/airflow/migrations/versions/0081_2e42bb497a22_rename_last_scheduler_run_column.py
 b/airflow/migrations/versions/0081_2_0_2_rename_last_scheduler_run_column.py
similarity index 100%
rename from 
airflow/migrations/versions/0081_2e42bb497a22_rename_last_scheduler_run_column.py
rename to 
airflow/migrations/versions/0081_2_0_2_rename_last_scheduler_run_column.py
diff --git 
a/airflow/migrations/versions/0082_90d1635d7b86_increase_pool_name_size_in_taskinstance.py
 
b/airflow/migrations/versions/0082_2_1_0_increase_pool_name_size_in_taskinstance.py
similarity index 100%
rename from 
airflow/migrations/versions/0082_90d1635d7b86_increase_pool_name_size_in_taskinstance.py
rename to 
airflow/migrations/versions/0082_2_1_0_increase_pool_name_size_in_taskinstance.py
diff --git 
a/airflow/migrations/versions/0083_e165e7455d70_add_description_field_to_variable.py
 b/airflow/migrations/versions/0083_2_1_0_add_description_field_to_variable.py
similarity index 100%
rename from 
airflow/migrations/versions/0083_e165e7455d70_add_description_field_to_variable.py
rename to 
airflow/migrations/versions/0083_2_1_0_add_description_field_to_variable.py
diff --git 
a/airflow/migrations/versions/0084_a13f7613ad25_resource_based_permissions_for_default_.py
 
b/airflow/migrations/versions/0084_2_1_0_resource_based_permissions_for_default_.py
similarity index 100%
rename from 
airflow/migrations/versions/0084_a13f7613ad25_resource_based_permissions_for_default_.py
rename to 
airflow/migrations/versions/0084_2_1_0_resource_based_permissions_for_default_.py
diff --git 
a/airflow/migrations/versions/0085_97cdd93827b8_add_queued_at_column_to_dagrun_table.py
 
b/airflow/migrations/versions/0085_2_1_3_add_queued_at_column_to_dagrun_table.py
similarity index 100%
rename from 
airflow/migrations/versions/0085_97cdd93827b8_add_queued_at_column_to_dagrun_table.py
rename to 
airflow/migrations/versions/0085_2_1_3_add_queued_at_column_to_dagrun_table.py
diff --git 
a/airflow/migrations/versions/0086_092435bf5d12_add_max_active_runs_column_to_dagmodel_.py
 
b/airflow/migrations/versions/0086_2_1_4_add_max_active_runs_column_to_dagmodel_.py
similarity index 100%
rename from 
airflow/migrations/versions/0086_092435bf5d12_add_max_active_runs_column_to_dagmodel_.py
rename to 
airflow/migrations/versions/0086_2_1_4_add_max_active_runs_column_to_dagmodel_.py
diff --git 
a/airflow/migrations/versions/0087_ccde3e26fe78_add_index_on_state_dag_id_for_queued_.py
 
b/airflow/migrations/versions/0087_2_1_4_add_index_on_state_dag_id_for_queued_.py
similarity index 100%
rename from 
airflow/migrations/versions/0087_ccde3e26fe78_add_index_on_state_dag_id_for_queued_.py
rename to 
airflow/migrations/versions/0087_2_1_4_add_index_on_state_dag_id_for_queued_.py
diff --git 
a/airflow/migrations/versions/0088_83f031fd9f1c_improve_mssql_compatibility.py 
b/airflow/migrations/versions/0088_2_2_0_improve_mssql_compatibility.py
similarity index 100%
rename from 
airflow/migrations/versions/0088_83f031fd9f1c_improve_mssql_compatibility.py
rename to airflow/migrations/versions/0088_2_2_0_improve_mssql_compatibility.py
diff --git 
a/airflow/migrations/versions/0089_e9304a3141f0_make_xcom_pkey_columns_non_nullable.py
 b/airflow/migrations/versions/0089_2_2_0_make_xcom_pkey_columns_non_nullable.py
similarity index 100%
rename from 
airflow/migrations/versions/0089_e9304a3141f0_make_xcom_pkey_columns_non_nullable.py
rename to 
airflow/migrations/versions/0089_2_2_0_make_xcom_pkey_columns_non_nullable.py
diff --git 
a/airflow/migrations/versions/0090_30867afad44a_rename_concurrency_column_in_dag_table_.py
 
b/airflow/migrations/versions/0090_2_2_0_rename_concurrency_column_in_dag_table_.py
similarity index 100%
rename from 
airflow/migrations/versions/0090_30867afad44a_rename_concurrency_column_in_dag_table_.py
rename to 
airflow/migrations/versions/0090_2_2_0_rename_concurrency_column_in_dag_table_.py
diff --git 
a/airflow/migrations/versions/0091_54bebd308c5f_add_trigger_table_and_task_info.py
 b/airflow/migrations/versions/0091_2_2_0_add_trigger_table_and_task_info.py
similarity index 100%
rename from 
airflow/migrations/versions/0091_54bebd308c5f_add_trigger_table_and_task_info.py
rename to 
airflow/migrations/versions/0091_2_2_0_add_trigger_table_and_task_info.py
diff --git 
a/airflow/migrations/versions/0092_142555e44c17_add_data_interval_start_end_to_dagmodel_and_dagrun.py
 
b/airflow/migrations/versions/0092_2_2_0_add_data_interval_start_end_to_dagmodel_and_dagrun.py
similarity index 100%
rename from 
airflow/migrations/versions/0092_142555e44c17_add_data_interval_start_end_to_dagmodel_and_dagrun.py
rename to 
airflow/migrations/versions/0092_2_2_0_add_data_interval_start_end_to_dagmodel_and_dagrun.py
diff --git 
a/airflow/migrations/versions/0093_7b2661a43ba3_taskinstance_keyed_to_dagrun.py 
b/airflow/migrations/versions/0093_2_2_0_taskinstance_keyed_to_dagrun.py
similarity index 100%
rename from 
airflow/migrations/versions/0093_7b2661a43ba3_taskinstance_keyed_to_dagrun.py
rename to airflow/migrations/versions/0093_2_2_0_taskinstance_keyed_to_dagrun.py
diff --git 
a/airflow/migrations/versions/0094_be2bfac3da23_add_has_import_errors_column_to_dagmodel.py
 
b/airflow/migrations/versions/0094_2_2_3_add_has_import_errors_column_to_dagmodel.py
similarity index 100%
rename from 
airflow/migrations/versions/0094_be2bfac3da23_add_has_import_errors_column_to_dagmodel.py
rename to 
airflow/migrations/versions/0094_2_2_3_add_has_import_errors_column_to_dagmodel.py
diff --git 
a/airflow/migrations/versions/0095_c381b21cb7e4_add_session_table_to_db.py 
b/airflow/migrations/versions/0095_2_2_4_add_session_table_to_db.py
similarity index 100%
rename from 
airflow/migrations/versions/0095_c381b21cb7e4_add_session_table_to_db.py
rename to airflow/migrations/versions/0095_2_2_4_add_session_table_to_db.py
diff --git 
a/airflow/migrations/versions/0096_587bdf053233_adding_index_for_dag_id_in_job.py
 b/airflow/migrations/versions/0096_2_2_4_adding_index_for_dag_id_in_job.py
similarity index 100%
rename from 
airflow/migrations/versions/0096_587bdf053233_adding_index_for_dag_id_in_job.py
rename to 
airflow/migrations/versions/0096_2_2_4_adding_index_for_dag_id_in_job.py
diff --git 
a/airflow/migrations/versions/0097_5e3ec427fdd3_increase_length_of_email_and_username.py
 
b/airflow/migrations/versions/0097_2_3_0_increase_length_of_email_and_username.py
similarity index 100%
rename from 
airflow/migrations/versions/0097_5e3ec427fdd3_increase_length_of_email_and_username.py
rename to 
airflow/migrations/versions/0097_2_3_0_increase_length_of_email_and_username.py
diff --git 
a/airflow/migrations/versions/0098_786e3737b18f_added_timetable_description_column.py
 b/airflow/migrations/versions/0098_2_3_0_added_timetable_description_column.py
similarity index 100%
rename from 
airflow/migrations/versions/0098_786e3737b18f_added_timetable_description_column.py
rename to 
airflow/migrations/versions/0098_2_3_0_added_timetable_description_column.py
diff --git 
a/airflow/migrations/versions/0099_f9da662e7089_add_task_log_filename_template_model.py
 
b/airflow/migrations/versions/0099_2_3_0_add_task_log_filename_template_model.py
similarity index 100%
rename from 
airflow/migrations/versions/0099_f9da662e7089_add_task_log_filename_template_model.py
rename to 
airflow/migrations/versions/0099_2_3_0_add_task_log_filename_template_model.py
diff --git 
a/airflow/migrations/versions/0100_e655c0453f75_add_taskmap_and_map_id_on_taskinstance.py
 
b/airflow/migrations/versions/0100_2_3_0_add_taskmap_and_map_id_on_taskinstance.py
similarity index 100%
rename from 
airflow/migrations/versions/0100_e655c0453f75_add_taskmap_and_map_id_on_taskinstance.py
rename to 
airflow/migrations/versions/0100_2_3_0_add_taskmap_and_map_id_on_taskinstance.py
diff --git 
a/airflow/migrations/versions/0101_a3bcd0914482_add_data_compressed_to_serialized_dag.py
 
b/airflow/migrations/versions/0101_2_3_0_add_data_compressed_to_serialized_dag.py
similarity index 100%
rename from 
airflow/migrations/versions/0101_a3bcd0914482_add_data_compressed_to_serialized_dag.py
rename to 
airflow/migrations/versions/0101_2_3_0_add_data_compressed_to_serialized_dag.py
diff --git 
a/airflow/migrations/versions/0102_c306b5b5ae4a_switch_xcom_table_to_use_run_id.py
 b/airflow/migrations/versions/0102_2_3_0_switch_xcom_table_to_use_run_id.py
similarity index 100%
rename from 
airflow/migrations/versions/0102_c306b5b5ae4a_switch_xcom_table_to_use_run_id.py
rename to 
airflow/migrations/versions/0102_2_3_0_switch_xcom_table_to_use_run_id.py
diff --git 
a/airflow/migrations/versions/0103_c97c2ab6aa23_add_callback_request_table.py 
b/airflow/migrations/versions/0103_2_3_0_add_callback_request_table.py
similarity index 100%
rename from 
airflow/migrations/versions/0103_c97c2ab6aa23_add_callback_request_table.py
rename to airflow/migrations/versions/0103_2_3_0_add_callback_request_table.py
diff --git 
a/airflow/migrations/versions/0104_4eaab2fe6582_migrate_rtif_to_use_run_id_and_map_index.py
 
b/airflow/migrations/versions/0104_2_3_0_migrate_rtif_to_use_run_id_and_map_index.py
similarity index 100%
rename from 
airflow/migrations/versions/0104_4eaab2fe6582_migrate_rtif_to_use_run_id_and_map_index.py
rename to 
airflow/migrations/versions/0104_2_3_0_migrate_rtif_to_use_run_id_and_map_index.py
diff --git 
a/airflow/migrations/versions/0105_48925b2719cb_add_map_index_to_taskfail.py 
b/airflow/migrations/versions/0105_2_3_0_add_map_index_to_taskfail.py
similarity index 100%
rename from 
airflow/migrations/versions/0105_48925b2719cb_add_map_index_to_taskfail.py
rename to airflow/migrations/versions/0105_2_3_0_add_map_index_to_taskfail.py
diff --git 
a/airflow/migrations/versions/0106_909884dea523_update_migration_for_fab_tables_to_add_missing_constraints.py
 
b/airflow/migrations/versions/0106_2_3_0_update_migration_for_fab_tables_to_add_missing_constraints.py
similarity index 100%
rename from 
airflow/migrations/versions/0106_909884dea523_update_migration_for_fab_tables_to_add_missing_constraints.py
rename to 
airflow/migrations/versions/0106_2_3_0_update_migration_for_fab_tables_to_add_missing_constraints.py
diff --git 
a/airflow/migrations/versions/0107_75d5ed6c2b43_add_map_index_to_log.py 
b/airflow/migrations/versions/0107_2_3_0_add_map_index_to_log.py
similarity index 100%
rename from 
airflow/migrations/versions/0107_75d5ed6c2b43_add_map_index_to_log.py
rename to airflow/migrations/versions/0107_2_3_0_add_map_index_to_log.py
diff --git 
a/airflow/migrations/versions/0108_b1b348e02d07_default_dag_view_grid.py 
b/airflow/migrations/versions/0108_2_3_0_default_dag_view_grid.py
similarity index 100%
rename from 
airflow/migrations/versions/0108_b1b348e02d07_default_dag_view_grid.py
rename to airflow/migrations/versions/0108_2_3_0_default_dag_view_grid.py
diff --git 
a/airflow/migrations/versions/0109_1de7bc13c950_add_index_for_event_in_log.py 
b/airflow/migrations/versions/0109_2_3_1_add_index_for_event_in_log.py
similarity index 100%
rename from 
airflow/migrations/versions/0109_1de7bc13c950_add_index_for_event_in_log.py
rename to airflow/migrations/versions/0109_2_3_1_add_index_for_event_in_log.py
diff --git a/scripts/in_container/run_migration_reference.py 
b/scripts/in_container/run_migration_reference.py
index 79585abb04..3bc656b11d 100755
--- a/scripts/in_container/run_migration_reference.py
+++ b/scripts/in_container/run_migration_reference.py
@@ -29,7 +29,7 @@ from alembic.script import ScriptDirectory
 from tabulate import tabulate
 
 from airflow.utils.db import _get_alembic_config
-from airflow.version import version as _airflow_version
+from setup import version as _airflow_version
 
 if TYPE_CHECKING:
     from alembic.script import Script
@@ -130,27 +130,54 @@ def num_to_prefix(idx: int) -> str:
     return f"000{idx+1}"[-4:] + '_'
 
 
-def ensure_mod_prefix(mod, idx):
-    prefix = num_to_prefix(idx)
-    match = re.match(r'([0-9_]+_)([a-z0-9]+_.+)', mod)
+def ensure_mod_prefix(mod_name, idx, version):
+    prefix = num_to_prefix(idx) + '_'.join(version) + '_'
+    match = re.match(r'([0-9]+)_([0-9]+)_([0-9]+)_([0-9]+)_(.+)', mod_name)
     if match:
-        mod = match.group(2)
-    return prefix + mod
+        # previously standardized file, rebuild the name
+        mod_name = match.group(5)
+    else:
+        # new migration file, standard format
+        match = re.match(r'([a-z0-9]+)_(.+)', mod_name)
+        if match:
+            mod_name = match.group(2)
+    return prefix + mod_name
 
 
 def ensure_filenames_are_sorted(revisions):
+    renames = []
+    is_branched = False
+    unmerged_heads = []
     for idx, rev in enumerate(revisions):
         mod_path = Path(rev.module.__file__)
-        correct_mod_basename = ensure_mod_prefix(mod_path.name, idx)
+        version = rev.module.airflow_version.split('.')[0:3]  # only first 3 
tokens
+        correct_mod_basename = ensure_mod_prefix(mod_path.name, idx, version)
         if mod_path.name != correct_mod_basename:
-            os.rename(mod_path, Path(mod_path.parent, correct_mod_basename))
+            renames.append((mod_path, Path(mod_path.parent, 
correct_mod_basename)))
+        if is_branched and rev.is_merge_point:
+            is_branched = False
+        if rev.is_branch_point:
+            is_branched = True
+        elif rev.is_head:
+            unmerged_heads.append(rev.revision)
+    if is_branched:
+        head_prefixes = [x[0:4] for x in unmerged_heads]
+        alembic_command = (
+            "alembic merge -m 'merge heads " + ', '.join(head_prefixes) + "' " 
+ ' '.join(unmerged_heads)
+        )
+        raise SystemExit(
+            "You have multiple alembic heads; please merge them with the 
`alembic merge` command "
+            f"and re-run pre-commit. It should fail once more before 
succeeding. "
+            f"\nhint: `{alembic_command}`"
+        )
+    for old, new in renames:
+        os.rename(old, new)
 
 
 if __name__ == '__main__':
     revisions = list(reversed(list(get_revisions())))
     ensure_airflow_version(revisions=revisions)
+    revisions = list(reversed(list(get_revisions())))
     ensure_filenames_are_sorted(revisions)
-    # if `ensure_airflow_version` modified any migrations, we'll need to reload
     revisions = list(get_revisions())
-
     update_docs(revisions)

Reply via email to