Merge pull request #13997 from jdavcs/dev_jobstatehistory

Drop update_time from JobStateHistory

lib/galaxy/model/__init__.py

@@ -106,7 +106,6 @@ from typing_extensions import Protocol
 
 import galaxy.exceptions
 import galaxy.model.metadata
-import galaxy.model.orm.now
 import galaxy.model.tags
 import galaxy.security.passwords
 import galaxy.util
@@ -2037,7 +2036,6 @@ class JobStateHistory(Base, RepresentById):
 
     id = Column(Integer, primary_key=True)
     create_time = Column(DateTime, default=now)
-    update_time = Column(DateTime, default=now, onupdate=now)
     job_id = Column(Integer, ForeignKey("job.id"), index=True)
     state = Column(String(64), index=True)
     info = Column(TrimmedString(255))

lib/galaxy/model/migrations/alembic/versions_gxy/186d4835587b_drop_job_state_history_update_time_.py

@@ -0,0 +1,32 @@
+"""drop job_state_history.update_time column
+
+Revision ID: 186d4835587b
+Revises: 6a67bf27e6a6
+Create Date: 2022-06-01 17:50:22.629894
+
+"""
+from alembic import op
+from sqlalchemy import (
+    Column,
+    DateTime,
+)
+
+from galaxy.model.migrations.util import drop_column
+from galaxy.model.orm.now import now
+
+# revision identifiers, used by Alembic.
+revision = "186d4835587b"
+down_revision = "6a67bf27e6a6"
+branch_labels = None
+depends_on = None
+
+table_name = "job_state_history"
+column_name = "update_time"
+
+
+def upgrade():
+    drop_column(table_name, column_name)
+
+
+def downgrade():
+    op.add_column(table_name, Column("update_time", DateTime, default=now, onupdate=now))

lib/galaxy/model/migrations/alembic/versions_gxy/b182f655505f_add_workflow_source_metadata_column.py

@@ -20,7 +20,7 @@ down_revision = "e7b6dcb09efd"
 branch_labels = None
 depends_on = None
 
-# database object names user in this revision
+# database object names used in this revision
 table_name = "workflow"
 column_name = "source_metadata"
 

test/unit/data/model/mapping/test_gxy_model_mapping.py

@@ -2805,16 +2805,13 @@ class TestJobStateHistory(BaseTest):
     def test_columns(self, session, cls_, job):
         state, info = job.state, job.info
         create_time = now()
-        update_time = create_time + timedelta(hours=1)
         obj = cls_(job)
         obj.create_time = create_time
-        obj.update_time = update_time
 
         with dbcleanup(session, obj) as obj_id:
             stored_obj = get_stored_obj(session, cls_, obj_id)
             assert stored_obj.id == obj_id
             assert stored_obj.create_time == create_time
-            assert stored_obj.update_time == update_time
             assert stored_obj.job_id == job.id
             assert stored_obj.state == state
             assert stored_obj.info == info