Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -216,9 +216,9 @@ class Group(Model):
Sequence("ab_group_id_seq", start=1, increment=1, minvalue=1, cycle=False),
primary_key=True,
)
name: Mapped[str] = Column(String(100), unique=True, nullable=False)
label: Mapped[str] = Column(String(150))
description: Mapped[str] = Column(String(512))
name: Mapped[str] = mapped_column(String(100), unique=True, nullable=False)
label: Mapped[str | None] = mapped_column(String(150))
description: Mapped[str | None] = mapped_column(String(512))
users: Mapped[list[User]] = relationship(
"User", secondary=assoc_user_group, backref="groups", passive_deletes=True
)
Expand Down
14 changes: 8 additions & 6 deletions providers/fab/tests/unit/fab/auth_manager/test_security.py
Original file line number Diff line number Diff line change
Expand Up @@ -29,13 +29,15 @@
from flask_appbuilder import Model, expose, has_access
from flask_appbuilder.models.sqla.interface import SQLAInterface
from flask_appbuilder.views import BaseView, ModelView
from sqlalchemy import Column, Date, Float, Integer, String, delete
from sqlalchemy import Date, Float, Integer, String, delete
from sqlalchemy.orm import Mapped

from airflow.api_fastapi.app import get_auth_manager
from airflow.exceptions import AirflowException
from airflow.models import DagModel
from airflow.models.dag import DAG
from airflow.models.dagbundle import DagBundleModel
from airflow.providers.common.compat.sqlalchemy.orm import mapped_column
from airflow.providers.fab.auth_manager.fab_auth_manager import FabAuthManager
from airflow.providers.fab.auth_manager.models.anonymous_user import AnonymousUser
from airflow.providers.fab.auth_manager.security_manager.override import FabAirflowSecurityManagerOverride
Expand Down Expand Up @@ -91,11 +93,11 @@ class MockSecurityManager(FabAirflowSecurityManagerOverride):
class SomeModel(Model):
__tablename__ = "some_model"

id = Column(Integer, primary_key=True)
field_string = Column(String(50), unique=True, nullable=False)
field_integer = Column(Integer())
field_float = Column(Float())
field_date = Column(Date())
id: Mapped[int] = mapped_column(Integer, primary_key=True)
field_string: Mapped[str] = mapped_column(String(50), unique=True, nullable=False)
field_integer: Mapped[int | None] = mapped_column(Integer())
field_float: Mapped[float | None] = mapped_column(Float())
field_date: Mapped[datetime.date | None] = mapped_column(Date())

def __repr__(self):
return str(self.field_string)
Expand Down