Skip to content

Commit

Permalink
Defer any_output_dataset_collection_instances_deleted and any_output_…
Browse files Browse the repository at this point in the history
…dataset_deleted

These are only needed in
https://github.com/mvdbeek/galaxy/blob/release_24.0/lib/galaxy/managers/jobs.py#L388-L389,
no need to always load them up.
  • Loading branch information
mvdbeek committed Mar 19, 2024
1 parent b9eed71 commit 96d89f8
Showing 1 changed file with 18 additions and 14 deletions.
32 changes: 18 additions & 14 deletions lib/galaxy/model/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -11134,23 +11134,27 @@ def __repr__(self):
# ----------------------------------------------------------------------------------------
# The following statements must not precede the mapped models defined above.

Job.any_output_dataset_collection_instances_deleted = column_property(
exists(HistoryDatasetCollectionAssociation.id).where(
and_(
Job.id == JobToOutputDatasetCollectionAssociation.job_id,
HistoryDatasetCollectionAssociation.id == JobToOutputDatasetCollectionAssociation.dataset_collection_id,
HistoryDatasetCollectionAssociation.deleted == true(),
)
Job.any_output_dataset_collection_instances_deleted = deferred(
column_property(
exists(HistoryDatasetCollectionAssociation.id).where(
and_(
Job.id == JobToOutputDatasetCollectionAssociation.job_id,
HistoryDatasetCollectionAssociation.id == JobToOutputDatasetCollectionAssociation.dataset_collection_id,
HistoryDatasetCollectionAssociation.deleted == true(),
)
),
)
)

Job.any_output_dataset_deleted = column_property(
exists(HistoryDatasetAssociation.id).where(
and_(
Job.id == JobToOutputDatasetAssociation.job_id,
HistoryDatasetAssociation.table.c.id == JobToOutputDatasetAssociation.dataset_id,
HistoryDatasetAssociation.table.c.deleted == true(),
)
Job.any_output_dataset_deleted = deferred(
column_property(
exists(HistoryDatasetAssociation.id).where(
and_(
Job.id == JobToOutputDatasetAssociation.job_id,
HistoryDatasetAssociation.table.c.id == JobToOutputDatasetAssociation.dataset_id,
HistoryDatasetAssociation.table.c.deleted == true(),
)
),
)
)

Expand Down

0 comments on commit 96d89f8

Please sign in to comment.