chore: add deprecation warnings for Column helpers

Author: HeloiseJoffe

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

@@ -1,5 +1,6 @@
 from __future__ import annotations
 
+import warnings
 from datetime import datetime
 from functools import partial
 from zoneinfo import ZoneInfo
@@ -12,9 +13,39 @@
 
 from .functions import utcnow
 
-Column: partial[RawColumn] = partial(RawColumn, nullable=False)
-NullColumn: partial[RawColumn] = partial(RawColumn, nullable=True)
-DateNowColumn = partial(Column, type_=DateTime(timezone=True), server_default=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")
@@ -32,6 +63,7 @@
 
 
 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)
 
 

diracx-testing/src/diracx/testing/mock_osdb.py

@@ -37,9 +37,7 @@ class JobParametersDB(MockOSDBMixin, JobParametersDB):
     """
 
     def __init__(self, connection_kwargs: dict[str, Any]) -> None:
-        from sqlalchemy import JSON, Column, Integer, MetaData, String, Table
-
-        from diracx.db.sql.utils import DateNowColumn
+        from sqlalchemy import JSON, Column, DateTime, Integer, MetaData, String, Table
 
         # Dynamically create a subclass of BaseSQLDB so we get clearer errors
         mocked_db = type(f"Mocked{self.__class__.__name__}", (sql_utils.BaseSQLDB,), {})
@@ -53,7 +51,11 @@ def __init__(self, connection_kwargs: dict[str, Any]) -> None:
         for field, field_type in self.fields.items():
             match field_type["type"]:
                 case "date":
-                    column_type = DateNowColumn
+                    column_type = partial(
+                        Column,
+                        type_=DateTime(timezone=True),
+                        server_default=sql_utils.utcnow(),
+                    )
                 case "long":
                     column_type = partial(Column, type_=Integer)
                 case "keyword":