-
Notifications
You must be signed in to change notification settings - Fork 14k
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Add missing AUTOINC/SERIAL for FAB tables (#26885)
* Add missing AUTOINC/SERIAL for FAB tables In 1.10.13 we introduced a migration that creates the tables with the server_default but that migration only did anything if the tables didn't already exist. But the tables created by the FAB model have a default (but not a server_default). Oh, and the final bit of the puzzle, in 2.4 we finally "took control" of the FAB security models in to airflow and those do not have the default set. * Update airflow/migrations/versions/0118_2_4_2_add_missing_autoinc_fab.py * Fix static checks * Run migrations with with a pool of a connection. Without this `create_session()` will open a new connection, and that causes mysql to hang waiting to get a "metadata lock on table". Using the "stock" pool with size=1 and max_overflow=0 doesn't work, that instead times out if you try to get a new connection from the pool. SingletonThreadPool instead returns the existing active connection which is what we want. Co-authored-by: Tzu-ping Chung <[email protected]> (cherry picked from commit 7efdeed)
- Loading branch information
1 parent
79047c5
commit 7f48924
Showing
6 changed files
with
113 additions
and
11 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
78 changes: 78 additions & 0 deletions
78
airflow/migrations/versions/0118_2_4_2_add_missing_autoinc_fab.py
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,78 @@ | ||
# | ||
# 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. | ||
|
||
"""Add missing auto-increment to columns on FAB tables | ||
Revision ID: b0d31815b5a6 | ||
Revises: ecb43d2a1842 | ||
Create Date: 2022-10-05 13:16:45.638490 | ||
""" | ||
|
||
from __future__ import annotations | ||
|
||
import sqlalchemy as sa | ||
from alembic import op | ||
|
||
# revision identifiers, used by Alembic. | ||
revision = 'b0d31815b5a6' | ||
down_revision = 'ecb43d2a1842' | ||
branch_labels = None | ||
depends_on = None | ||
airflow_version = '2.4.2' | ||
|
||
|
||
def upgrade(): | ||
"""Apply migration. | ||
If these columns are already of the right type (i.e. created by our | ||
migration in 1.10.13 rather than FAB itself in an earlier version), this | ||
migration will issue an alter statement to change them to what they already | ||
are -- i.e. its a no-op. | ||
These tables are small (100 to low 1k rows at most), so it's not too costly | ||
to change them. | ||
""" | ||
conn = op.get_bind() | ||
if conn.dialect.name in ['mssql', 'sqlite']: | ||
# 1.10.12 didn't support SQL Server, so it couldn't have gotten this wrong --> nothing to correct | ||
# SQLite autoinc was "implicit" for an INTEGER NOT NULL PRIMARY KEY | ||
return | ||
|
||
for table in ( | ||
'ab_permission', | ||
'ab_view_menu', | ||
'ab_role', | ||
'ab_permission_view', | ||
'ab_permission_view_role', | ||
'ab_user', | ||
'ab_user_role', | ||
'ab_register_user', | ||
): | ||
with op.batch_alter_table(table) as batch: | ||
kwargs = {} | ||
if conn.dialect.name == 'postgresql': | ||
kwargs['type_'] = sa.Sequence(f'{table}_id_seq').next_value() | ||
else: | ||
kwargs['autoincrement'] = True | ||
batch.alter_column("id", existing_type=sa.Integer(), existing_nullable=False, **kwargs) | ||
|
||
|
||
def downgrade(): | ||
"""Unapply add_missing_autoinc_fab""" | ||
# No downgrade needed, these _should_ have applied from 1.10.13 but didn't due to a previous bug! |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1 +1 @@ | ||
543fe0db520047b59d9d036b17d54b07f1031a2b6ef1f46dcd2ae970f14ab0e6 | ||
030fee7fdf6b154b107a12331400a26843f4ebb4abaab84566aeca7c26d79450 |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters