From d7beda0f1acf2fc923f4389fad3cc9fb049b7afe Mon Sep 17 00:00:00 2001 From: mvdbeek Date: Thu, 26 Oct 2023 16:44:48 +0200 Subject: [PATCH] Commit if we've got outstanding MetadataFile instances --- lib/galaxy/model/metadata.py | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/model/metadata.py b/lib/galaxy/model/metadata.py index ed757314edc..a0b53a1527a 100644 --- a/lib/galaxy/model/metadata.py +++ b/lib/galaxy/model/metadata.py @@ -604,7 +604,16 @@ class FileParameter(MetadataParameter): if isinstance(value, int): return session.query(galaxy.model.MetadataFile).get(value) else: - return session.query(galaxy.model.MetadataFile).filter_by(uuid=value).one() + wrapped_value = session.query(galaxy.model.MetadataFile).filter_by(uuid=value).one_or_none() + if wrapped_value: + return wrapped_value + else: + # If we've simultaneously copied the dataset and we've changed the datatype on the + # copy we may not have committed the MetadataFile yet, so we need to commit the session. + # TODO: It would be great if we can avoid the commit in the future. + with transaction(session): + session.commit() + return session.query(galaxy.model.MetadataFile).filter_by(uuid=value).one_or_none() def make_copy(self, value, target_context: MetadataCollection, source_context): session = target_context._object_session(target_context.parent)