Skip to content

refactor: migrate models to use mapped_column for SQLAlchemy 2.0 compatibility #56827

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

Merged
vincbeck merged 2 commits into from
Oct 24, 2025
Merged

refactor: migrate models to use mapped_column for SQLAlchemy 2.0 compatibility #56827

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
4acc955
refactor: migrate models to use mapped_column for SQLAlchemy 2.0 comp…
josix Oct 18, 2025
c4bc49e
fixup! refactor: migrate models to use mapped_column for SQLAlchemy 2…
josix Oct 24, 2025
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
8 changes: 0 additions & 8 deletions providers/fab/src/airflow/providers/fab/auth_manager/models/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,8 +21,6 @@
# This product contains a modified portion of 'Flask App Builder' developed by Daniel Vaz Gaspar.
# (https://github.com/dpgaspar/Flask-AppBuilder).
# Copyright 2013, Daniel Vaz Gaspar
from typing import TYPE_CHECKING

from flask import current_app, g
from flask_appbuilder import Model
from sqlalchemy import (
Expand All @@ -45,12 +43,6 @@
from airflow.api_fastapi.auth.managers.models.base_user import BaseUser
from airflow.providers.common.compat.sqlalchemy.orm import mapped_column

if TYPE_CHECKING:
try:
from sqlalchemy import Identity
except Exception:
Identity = None

"""
Compatibility note: The models in this file are duplicated from Flask AppBuilder.
"""
Expand Down
7 changes: 2 additions & 5 deletions providers/fab/tests/unit/fab/auth_manager/models/test_user_model.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,9 @@

@pytest.mark.parametrize(
"user_id, expected_id",
[
(999, "999"),
("999", "999"),
],
[(999, "999")],
)
def test_get_id_returns_str(user_id: int | str, expected_id: str) -> None:
def test_get_id_returns_str(user_id: int, expected_id: str) -> None:
"""
Ensure get_id() always returns a string representation of the id.
"""
Expand Down