hazza/DSpace
1
0
Fork 0
mirror of https://github.com/DSpace/DSpace.git synced 2025-10-08 10:34:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Remove unnecessary SQL "GROUP BY" clauses. There are no aggregate functions requiring a GROUP BY, and they throw errors now in latest Hibernate/Postgres

Browse Source
This commit is contained in:
Tim Donohue
2024-03-27 16:28:05 -05:00
parent 66402b2d62
commit 4cf06cbc3d
1 changed files with 0 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
dspace-api/src/main/java/org/dspace/content/dao/impl/ItemDAOImpl.java
View File

@@ -203,7 +203,6 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO<Item> implements ItemDA
queryPredicates, collectionUuids, regexClause); queryPredicates, collectionUuids, regexClause);
criteriaQuery.where(criteriaBuilder.and(predicates.stream().toArray(Predicate[]::new))); criteriaQuery.where(criteriaBuilder.and(predicates.stream().toArray(Predicate[]::new)));
criteriaQuery.orderBy(criteriaBuilder.asc(itemRoot.get(DSpaceObject_.id))); criteriaQuery.orderBy(criteriaBuilder.asc(itemRoot.get(DSpaceObject_.id)));
criteriaQuery.groupBy(itemRoot.get(DSpaceObject_.id));
try { try {
return list(context, criteriaQuery, false, Item.class, limit, (int) offset); return list(context, criteriaQuery, false, Item.class, limit, (int) offset);
} catch (Exception e) { } catch (Exception e) {
@@ -344,7 +343,6 @@ public class ItemDAOImpl extends AbstractHibernateDSODAO<Item> implements ItemDA
criteriaBuilder.isMember(collection, itemRoot.get(Item_.collections)), criteriaBuilder.isMember(collection, itemRoot.get(Item_.collections)),
criteriaBuilder.isTrue(itemRoot.get(Item_.inArchive)))); criteriaBuilder.isTrue(itemRoot.get(Item_.inArchive))));
criteriaQuery.orderBy(criteriaBuilder.asc(itemRoot.get(DSpaceObject_.id))); criteriaQuery.orderBy(criteriaBuilder.asc(itemRoot.get(DSpaceObject_.id)));
criteriaQuery.groupBy(itemRoot.get(DSpaceObject_.id));
return list(context, criteriaQuery, false, Item.class, limit, offset).iterator(); return list(context, criteriaQuery, false, Item.class, limit, offset).iterator();
} }