refactor: replace remaining sa.String with EnumText 2 (#33448)

This commit is contained in:
tmimmanuel
2026-03-14 11:20:30 +00:00
committed by GitHub
parent 79a8747c1b
commit 98df8e1d6c
6 changed files with 64 additions and 23 deletions

View File

@ -323,6 +323,11 @@ class AccountIntegrate(TypeBase):
)
class InvitationCodeStatus(enum.StrEnum):
UNUSED = "unused"
USED = "used"
class InvitationCode(TypeBase):
__tablename__ = "invitation_codes"
__table_args__ = (
@ -334,7 +339,11 @@ class InvitationCode(TypeBase):
id: Mapped[int] = mapped_column(sa.Integer, init=False)
batch: Mapped[str] = mapped_column(String(255))
code: Mapped[str] = mapped_column(String(32))
status: Mapped[str] = mapped_column(String(16), server_default=sa.text("'unused'"), default="unused")
status: Mapped[InvitationCodeStatus] = mapped_column(
EnumText(InvitationCodeStatus, length=16),
server_default=sa.text("'unused'"),
default=InvitationCodeStatus.UNUSED,
)
used_at: Mapped[datetime | None] = mapped_column(DateTime, default=None)
used_by_tenant_id: Mapped[str | None] = mapped_column(StringUUID, default=None)
used_by_account_id: Mapped[str | None] = mapped_column(StringUUID, default=None)
@ -366,10 +375,13 @@ class TenantPluginPermission(TypeBase):
)
tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
install_permission: Mapped[InstallPermission] = mapped_column(
String(16), nullable=False, server_default="everyone", default=InstallPermission.EVERYONE
EnumText(InstallPermission, length=16),
nullable=False,
server_default="everyone",
default=InstallPermission.EVERYONE,
)
debug_permission: Mapped[DebugPermission] = mapped_column(
String(16), nullable=False, server_default="noone", default=DebugPermission.NOBODY
EnumText(DebugPermission, length=16), nullable=False, server_default="noone", default=DebugPermission.NOBODY
)
@ -395,10 +407,13 @@ class TenantPluginAutoUpgradeStrategy(TypeBase):
)
tenant_id: Mapped[str] = mapped_column(StringUUID, nullable=False)
strategy_setting: Mapped[StrategySetting] = mapped_column(
String(16), nullable=False, server_default="fix_only", default=StrategySetting.FIX_ONLY
EnumText(StrategySetting, length=16),
nullable=False,
server_default="fix_only",
default=StrategySetting.FIX_ONLY,
)
upgrade_mode: Mapped[UpgradeMode] = mapped_column(
String(16), nullable=False, server_default="exclude", default=UpgradeMode.EXCLUDE
EnumText(UpgradeMode, length=16), nullable=False, server_default="exclude", default=UpgradeMode.EXCLUDE
)
exclude_plugins: Mapped[list[str]] = mapped_column(sa.JSON, nullable=False, default_factory=list)
include_plugins: Mapped[list[str]] = mapped_column(sa.JSON, nullable=False, default_factory=list)