From 4cf06cbc3d9722a92a1ca4d23cb1553db5df9489 Mon Sep 17 00:00:00 2001 From: Tim Donohue Date: Wed, 27 Mar 2024 16:28:05 -0500 Subject: [PATCH] Remove unnecessary SQL "GROUP BY" clauses. There are no aggregate functions requiring a GROUP BY, and they throw errors now in latest Hibernate/Postgres --- .../src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java b/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java index 0e5327cebc..94d2bb80c4 100644 --- a/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java +++ b/dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java @@ -203,7 +203,6 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO implements ItemDA queryPredicates, collectionUuids, regexClause); criteriaQuery.where(criteriaBuilder.and(predicates.stream().toArray(Predicate[]::new))); criteriaQuery.orderBy(criteriaBuilder.asc(itemRoot.get(DSpaceObject_.id))); - criteriaQuery.groupBy(itemRoot.get(DSpaceObject_.id)); try { return list(context, criteriaQuery, false, Item.class, limit, (int) offset); } catch (Exception e) { @@ -344,7 +343,6 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO implements ItemDA criteriaBuilder.isMember(collection, itemRoot.get(Item_.collections)), criteriaBuilder.isTrue(itemRoot.get(Item_.inArchive)))); criteriaQuery.orderBy(criteriaBuilder.asc(itemRoot.get(DSpaceObject_.id))); - criteriaQuery.groupBy(itemRoot.get(DSpaceObject_.id)); return list(context, criteriaQuery, false, Item.class, limit, offset).iterator(); }