chore: remove deprecated helpers (#789)

Author: HeloiseJoffe

diracx-db/src/diracx/db/sql/utils/__init__.py

@@ -3,12 +3,8 @@
 __all__ = [
     "_get_columns",
     "utcnow",
-    "Column",
-    "NullColumn",
-    "DateNowColumn",
     "BaseSQLDB",
     "EnumBackedBool",
-    "EnumColumn",
     "enum_column",
     "apply_search_filters",
     "apply_sort_constraints",
@@ -37,11 +33,7 @@
 )
 from .functions import hash, substract_date, utcnow
 from .types import (
-    Column,
-    DateNowColumn,
     EnumBackedBool,
-    EnumColumn,
-    NullColumn,
     datetime_now,
     enum_column,
     str32,

diracx-db/src/diracx/db/sql/utils/types.py

@@ -1,52 +1,15 @@
 from __future__ import annotations
 
-import warnings
 from datetime import datetime
-from functools import partial
 from zoneinfo import ZoneInfo
 
 import sqlalchemy.types as types
-from sqlalchemy import Column as RawColumn
 from sqlalchemy import DateTime, Enum
 from sqlalchemy.orm import mapped_column
 from typing_extensions import Annotated
 
 from .functions import utcnow
 
-
-def _deprecated(name: str, replacement: str):
-    warnings.warn(
-        f"{name} is deprecated and will be removed in a future major release. "
-        f"Use {replacement} instead.",
-        DeprecationWarning,
-        stacklevel=3,
-    )
-
-
-_Column: partial[RawColumn] = partial(RawColumn, nullable=False)
-
-
-def Column(*args, **kwargs):  # noqa: N802
-    _deprecated("Column", "Mapped[...] + mapped_column(...)")
-    return _Column(*args, **kwargs)
-
-
-_NullColumn: partial[RawColumn] = partial(RawColumn, nullable=True)
-
-
-def NullColumn(*args, **kwargs):  # noqa: N802
-    _deprecated("NullColumn", "Mapped[Optional[...]] + mapped_column(...)")
-    return _NullColumn(*args, **kwargs)
-
-
-_DateNowColumn = partial(Column, type_=DateTime(timezone=True), server_default=utcnow())
-
-
-def DateNowColumn(*args, **kwargs):  # noqa: N802
-    _deprecated("DateNowColumn", "Mapped[datetime_now] + mapped_column(...)")
-    return _DateNowColumn(*args, **kwargs)
-
-
 # Module-level constants for default timezone values
 _DEFAULT_UTC = ZoneInfo("UTC")
 
@@ -62,11 +25,6 @@ def DateNowColumn(*args, **kwargs):  # noqa: N802
 str1024 = Annotated[str, 1024]
 
 
-def EnumColumn(name, enum_type, **kwargs):  # noqa: N802
-    _deprecated("EnumColumn", "Mapped[...] + enum_column(...)")
-    return Column(name, Enum(enum_type, native_enum=False, length=16), **kwargs)
-
-
 def enum_column(name, enum_type, **kwargs):
     return mapped_column(name, Enum(enum_type, native_enum=False, length=16), **kwargs)