Merge branch 'release_25.1' into dev

Author: nsoranzo

lib/galaxy/model/__init__.py

@@ -4742,26 +4742,32 @@ def _touch_collection_update_time_cte(self, session, supports_skip_locked):
             literal(0).label("depth_level"),
         ]
 
-        # Create a single base query that covers both HDA and LDDA cases using OR conditions
-        base_query = (
+        # Create separate base queries for HDA and LDDA cases and union them
+        # We need to wrap the union in a subquery to use it as the anchor for the recursive CTE
+        union_query = (
             select(*base_columns)
             .select_from(
-                DatasetCollectionElement.__table__.outerjoin(
+                DatasetCollectionElement.__table__.join(
                     HistoryDatasetAssociation.__table__, DatasetCollectionElement.hda_id == HistoryDatasetAssociation.id
-                ).outerjoin(
-                    LibraryDatasetDatasetAssociation.__table__,
-                    DatasetCollectionElement.ldda_id == LibraryDatasetDatasetAssociation.id,
                 )
             )
-            .where(
-                or_(
-                    HistoryDatasetAssociation.dataset_id == self.id,
-                    LibraryDatasetDatasetAssociation.dataset_id == self.id,
+            .where(HistoryDatasetAssociation.dataset_id == self.id)
+            .union(
+                select(*base_columns)
+                .select_from(
+                    DatasetCollectionElement.__table__.join(
+                        LibraryDatasetDatasetAssociation.__table__,
+                        DatasetCollectionElement.ldda_id == LibraryDatasetDatasetAssociation.id,
+                    )
                 )
+                .where(LibraryDatasetDatasetAssociation.dataset_id == self.id)
             )
-        )
+        ).subquery()
+
+        # Select from the union subquery to create a proper base query for the CTE
+        base_query = select(union_query.c.collection_id, union_query.c.depth_level)
 
-        # Create the recursive CTE from the single base query
+        # Create the recursive CTE from the base query
         collection_hierarchy_cte = base_query.cte(name="collection_hierarchy", recursive=True)
 
         # Create aliases for the recursive part

lib/galaxy_test/api/test_workflows.py

@@ -8738,7 +8738,7 @@ def test_run_workflow_use_cached_job_implicit_conversion_send_to_new_history(sel
             workflow_id = self.workflow_populator.upload_yaml_workflow(wf)
 
             # Run workflow first time
-            workflow_request: Dict[str, Any] = {
+            workflow_request: dict[str, Any] = {
                 "inputs": json.dumps({"fastq_input": self._ds_entry(dataset)}),
                 "history": f"hist_id={history_id}",
                 "inputs_by": "name",