From 561e6e900b3e71a5f280a45def78f66d22952d69 Mon Sep 17 00:00:00 2001 From: davelopez <46503462+davelopez@users.noreply.github.com> Date: Thu, 2 May 2024 17:58:49 +0200 Subject: [PATCH] Fix `update_time` typing in models The default is `now` so we should have always a value in the Python model even if the column can be nullable. --- lib/galaxy/model/__init__.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/lib/galaxy/model/__init__.py b/lib/galaxy/model/__init__.py index 04c19ab436c..a1c2c33f282 100644 --- a/lib/galaxy/model/__init__.py +++ b/lib/galaxy/model/__init__.py @@ -430,7 +430,7 @@ class HasName: class UsesCreateAndUpdateTime: - update_time: Mapped[Optional[datetime]] + update_time: Mapped[datetime] @property def seconds_since_updated(self): @@ -454,7 +454,7 @@ class WorkerProcess(Base, UsesCreateAndUpdateTime): server_name: Mapped[Optional[str]] = mapped_column(String(255), index=True) hostname: Mapped[Optional[str]] = mapped_column(String(255)) pid: Mapped[Optional[int]] - update_time: Mapped[Optional[datetime]] = mapped_column(default=now, onupdate=now) + update_time: Mapped[datetime] = mapped_column(default=now, onupdate=now, nullable=True) def cached_id(galaxy_model_object): @@ -5472,7 +5472,7 @@ class HistoryDatasetAssociationHistory(Base): history_dataset_association_id: Mapped[Optional[int]] = mapped_column( ForeignKey("history_dataset_association.id"), index=True ) - update_time: Mapped[Optional[datetime]] = mapped_column(default=now) + update_time: Mapped[datetime] = mapped_column(default=now, nullable=True) version: Mapped[Optional[int]] name: Mapped[Optional[str]] = mapped_column(TrimmedString(255)) extension: Mapped[Optional[str]] = mapped_column(TrimmedString(64)) @@ -9638,8 +9638,8 @@ class FormDefinition(Base, Dictifiable, RepresentById): __tablename__ = "form_definition" id: Mapped[int] = mapped_column(primary_key=True) - create_time: Mapped[Optional[datetime]] = mapped_column(default=now) - update_time: Mapped[Optional[datetime]] = mapped_column(default=now, onupdate=now) + create_time: Mapped[datetime] = mapped_column(default=now, nullable=True) + update_time: Mapped[datetime] = mapped_column(default=now, onupdate=now, nullable=True) name: Mapped[str] = mapped_column(TrimmedString(255)) desc: Mapped[Optional[str]] = mapped_column(TEXT) form_definition_current_id: Mapped[int] = mapped_column(