Skip to content

Move migration drop_ab_user_id_foreign_key to FAB provider #48805

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vincbeck wants to merge 1 commit into from
Closed

Move migration drop_ab_user_id_foreign_key to FAB provider #48805

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 0 additions & 11 deletions .pre-commit-config.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1186,17 +1186,6 @@ repos:
\bab_register_user\b
pass_filenames: true
files: ^airflow-core/src/airflow/migrations/versions/.*\.py$
# These migrations contain FAB related changes but existed before moving FAB auth manager
# to its own provider
exclude: >
(?ix)^(
airflow-core/src/airflow/migrations/versions/00.*\.py|
airflow-core/src/airflow/migrations/versions/0106.*\.py|
airflow-core/src/airflow/migrations/versions/0118.*\.py|
airflow-core/src/airflow/migrations/versions/0119.*\.py|
airflow-core/src/airflow/migrations/versions/0121.*\.py|
airflow-core/src/airflow/migrations/versions/0124.*\.py
)$
## ADD MOST PRE-COMMITS ABOVE THAT LINE
# The below pre-commits are those requiring CI image to be built
- id: mypy-dev
Expand Down
2 changes: 1 addition & 1 deletion airflow-core/docs/img/airflow_erd.sha256
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
5ee140103f80a15dc6cc7c808a49c415901a7c062d2cab9d26d49abd86e82aea
58a5baed7e6b3aee53ffbf3c352b114d2efe41fea006afb025ecb4697d60243e
4 changes: 1 addition & 3 deletions airflow-core/docs/migrations-ref.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,11 +112,9 @@ Here's the list of all the Database Migrations that are executed via when you ru
+-------------------------+------------------+-------------------+--------------------------------------------------------------+
| ``0bfc26bc256e`` | ``d0f1c55954fa`` | ``3.0.0`` | Rename DagModel schedule_interval to timetable_summary. |
+-------------------------+------------------+-------------------+--------------------------------------------------------------+
| ``d0f1c55954fa`` | ``044f740568ec`` | ``3.0.0`` | Remove SubDAGs: ``is_subdag`` & ``root_dag_id`` columns from |
| ``d0f1c55954fa`` | ``5f2621c13b39`` | ``3.0.0`` | Remove SubDAGs: ``is_subdag`` & ``root_dag_id`` columns from |
| | | | DAG table. |
+-------------------------+------------------+-------------------+--------------------------------------------------------------+
| ``044f740568ec`` | ``5f2621c13b39`` | ``3.0.0`` | Drop ab_user.id foreign key. |
+-------------------------+------------------+-------------------+--------------------------------------------------------------+
| ``5f2621c13b39`` | ``22ed7efa9da2`` | ``2.10.3`` | Rename dag_schedule_dataset_alias_reference constraint |
| | | | names. |
+-------------------------+------------------+-------------------+--------------------------------------------------------------+
Expand Down
4 changes: 2 additions & 2 deletions ...s/versions/0029_3_0_0_remove_is_subdag.py → ...s/versions/0028_3_0_0_remove_is_subdag.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
Remove SubDAGs: ``is_subdag`` & ``root_dag_id`` columns from DAG table.

Revision ID: d0f1c55954fa
Revises: 044f740568ec
Revises: 5f2621c13b39
Create Date: 2024-08-11 21:32:40.576172

"""
Expand All @@ -34,7 +34,7 @@

# revision identifiers, used by Alembic.
revision = "d0f1c55954fa"
down_revision = "044f740568ec"
down_revision = "5f2621c13b39"
branch_labels = None
depends_on = None
airflow_version = "3.0.0"
Expand Down
0 ...rename_schedule_interval_to_timetable_.py → ...rename_schedule_interval_to_timetable_.py
View file
Open in desktop
File renamed without changes.
0 ...3_0_0_add_triggered_by_field_to_dagrun.py → ...3_0_0_add_triggered_by_field_to_dagrun.py
View file
Open in desktop
File renamed without changes.
0 ...tion_date_to_logical_date_and_nullable.py → ...tion_date_to_logical_date_and_nullable.py
View file
Open in desktop
File renamed without changes.
0 ...ons/0033_3_0_0_add_tables_for_backfill.py → ...ons/0032_3_0_0_add_tables_for_backfill.py
View file
Open in desktop
File renamed without changes.
0 ...ions/0034_3_0_0_remove_redundant_index.py → ...ions/0033_3_0_0_remove_redundant_index.py
View file
Open in desktop
File renamed without changes.
0 ...ersions/0035_3_0_0_update_user_id_type.py → ...ersions/0034_3_0_0_update_user_id_type.py
View file
Open in desktop
File renamed without changes.
0 ..._3_0_0_add_name_field_to_dataset_model.py → ..._3_0_0_add_name_field_to_dataset_model.py
View file
Open in desktop
File renamed without changes.
0 ...37_3_0_0_add_backfill_to_dag_run_model.py → ...36_3_0_0_add_backfill_to_dag_run_model.py
View file
Open in desktop
File renamed without changes.
0 ...s/versions/0038_3_0_0_add_asset_active.py → ...s/versions/0037_3_0_0_add_asset_active.py
View file
Open in desktop
File renamed without changes.
0 ...0_tweak_assetaliasmodel_to_match_asset.py → ...0_tweak_assetaliasmodel_to_match_asset.py
View file
Open in desktop
File renamed without changes.
0 ...add_exception_reason_and_logical_date_.py → ...add_exception_reason_and_logical_date_.py
View file
Open in desktop
File renamed without changes.
0 ...ons/0041_3_0_0_rename_dataset_as_asset.py → ...ons/0040_3_0_0_rename_dataset_as_asset.py
View file
Open in desktop
File renamed without changes.
0 ...add_uuid_primary_key_to_task_instance_.py → ...add_uuid_primary_key_to_task_instance_.py
View file
Open in desktop
File renamed without changes.
0 ...043_3_0_0_remove_scheduler_lock_column.py → ...042_3_0_0_remove_scheduler_lock_column.py
View file
Open in desktop
File renamed without changes.
0 ...sions/0044_3_0_0__drop_task_fail_table.py → ...sions/0043_3_0_0__drop_task_fail_table.py
View file
Open in desktop
File renamed without changes.
0 ...0_add_last_heartbeat_at_directly_to_ti.py → ...0_add_last_heartbeat_at_directly_to_ti.py
View file
Open in desktop
File renamed without changes.
0 .../versions/0046_3_0_0_drop_dag_pickling.py → .../versions/0045_3_0_0_drop_dag_pickling.py
View file
Open in desktop
File renamed without changes.
0 ...versions/0047_3_0_0_add_dag_versioning.py → ...versions/0046_3_0_0_add_dag_versioning.py
View file
Open in desktop
File renamed without changes.
0 ...0048_3_0_0_add_trigger_asset_reference.py → ...0047_3_0_0_add_trigger_asset_reference.py
View file
Open in desktop
File renamed without changes.
0 ..._0_remove_pickled_data_from_xcom_table.py → ..._0_remove_pickled_data_from_xcom_table.py
View file
Open in desktop
File renamed without changes.
0 ...versions/0050_3_0_0_add_dagbundlemodel.py → ...versions/0049_3_0_0_add_dagbundlemodel.py
View file
Open in desktop
File renamed without changes.
0 ...nstance_trigger_timeout_to_utcdatetime.py → ...nstance_trigger_timeout_to_utcdatetime.py
View file
Open in desktop
File renamed without changes.
0 ...s/0052_3_0_0_add_deadline_alerts_table.py → ...s/0051_3_0_0_add_deadline_alerts_table.py
View file
Open in desktop
File renamed without changes.
0 ...ons/0053_3_0_0_remove_processor_subdir.py → ...ons/0052_3_0_0_remove_processor_subdir.py
View file
Open in desktop
File renamed without changes.
0 .../0054_3_0_0_add_asset_reference_models.py → .../0053_3_0_0_add_asset_reference_models.py
View file
Open in desktop
File renamed without changes.
0 ..._remove_pickled_data_from_dagrun_table.py → ..._remove_pickled_data_from_dagrun_table.py
View file
Open in desktop
File renamed without changes.
0 ...0056_3_0_0_add_relative_fileloc_column.py → ...0055_3_0_0_add_relative_fileloc_column.py
View file
Open in desktop
File renamed without changes.
0 ...add_new_task_instance_field_scheduled_.py → ...add_new_task_instance_field_scheduled_.py
View file
Open in desktop
File renamed without changes.
0 ...rsions/0058_3_0_0_add_dagrun_run_after.py → ...rsions/0057_3_0_0_add_dagrun_run_after.py
View file
Open in desktop
File renamed without changes.
0 ...59_3_0_0_remove_external_trigger_field.py → ...58_3_0_0_remove_external_trigger_field.py
View file
Open in desktop
File renamed without changes.
0 ...ns/0060_3_0_0_add_try_id_to_ti_and_tih.py → ...ns/0059_3_0_0_add_try_id_to_ti_and_tih.py
View file
Open in desktop
File renamed without changes.
0 ...0_0_use_ti_id_as_primary_key_to_TINote.py → ...0_0_use_ti_id_as_primary_key_to_TINote.py
View file
Open in desktop
File renamed without changes.
0 ...ons/0062_3_0_0_remove_dag_default_view.py → ...ons/0061_3_0_0_remove_dag_default_view.py
View file
Open in desktop
File renamed without changes.
0 ..._0_0_use_ti_id_as_fk_to_taskreschedule.py → ..._0_0_use_ti_id_as_fk_to_taskreschedule.py
View file
Open in desktop
File renamed without changes.
0 ...ersions/0064_3_0_0_support_bundles_in_.py → ...ersions/0063_3_0_0_support_bundles_in_.py
View file
Open in desktop
File renamed without changes.
0 ...ns/0065_3_0_0_add_new_otel_span_fields.py → ...ns/0064_3_0_0_add_new_otel_span_fields.py
View file
Open in desktop
File renamed without changes.
12 changes: 7 additions & 5 deletions providers/fab/docs/migrations-ref.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,11 +31,13 @@ Here's the list of all the Database Migrations that are executed via when you ru
.. All table elements are scraped from migration files
.. Beginning of auto-generated table

+-------------------------+--------------+---------------+------------------------+
| Revision ID | Revises ID | Fab Version | Description |
+=========================+==============+===============+========================+
| ``6709f7a774b9`` (head) | ``None`` | ``1.4.0`` | placeholder migration. |
+-------------------------+--------------+---------------+------------------------+
+-------------------------+------------------+---------------+------------------------------+
| Revision ID | Revises ID | Fab Version | Description |
+=========================+==================+===============+==============================+
| ``044f740568ec`` (head) | ``6709f7a774b9`` | ``2.0.0`` | Drop ab_user.id foreign key. |
+-------------------------+------------------+---------------+------------------------------+
| ``6709f7a774b9`` (base) | ``None`` | ``1.4.0`` | placeholder migration. |
+-------------------------+------------------+---------------+------------------------------+

.. End of auto-generated table

Expand Down
1 change: 1 addition & 0 deletions providers/fab/src/airflow/providers/fab/auth_manager/models/db.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@

_REVISION_HEADS_MAP: dict[str, str] = {
"1.4.0": "6709f7a774b9",
"2.0.0": "044f740568ec",
}


Expand Down
5 changes: 3 additions & 2 deletions ...0028_3_0_0_drop_ab_user_id_foreign_key.py → ...0002_2_0_0_drop_ab_user_id_foreign_key.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
Drop ab_user.id foreign key.

Revision ID: 044f740568ec
Revises: 5f2621c13b39
Revises: 6709f7a774b9
Create Date: 2024-08-02 07:18:29.830521

"""
Expand All @@ -31,9 +31,10 @@

# revision identifiers, used by Alembic.
revision = "044f740568ec"
down_revision = "5f2621c13b39"
down_revision = "6709f7a774b9"
branch_labels = None
depends_on = None
fab_version = "2.0.0"
airflow_version = "3.0.0"


Expand Down