Merge pull request #3218 from ebean-orm/backport-12x/3173-BeanSet-ini…

…t-loading [12x] Backport of fix for #3173 BeanSet init(), initClear() and BeanMap
ebean-orm · Sep 7, 2023 · 88fd59e · 88fd59e
2 parents 514bba4 + 5b9ef2d
commit 88fd59e
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/ebean-api/src/main/java/io/ebean/common/BeanSet.java b/ebean-api/src/main/java/io/ebean/common/BeanSet.java
@@ -117,7 +117,7 @@ private void initClear() {
  try {
  if (set == null) {
  if (!disableLazyLoad && modifyListening) {
- lazyLoadCollection(true);
+ lazyLoadCollection(false);
  } else {
  set = new LinkedHashSet<>();
  }
@@ -134,7 +134,7 @@ private void init() {
  if (disableLazyLoad) {
  set = new LinkedHashSet<>();
  } else {
- lazyLoadCollection(true);
+ lazyLoadCollection(false);
  }
  }
  } finally {

diff --git a/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java b/ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
@@ -97,8 +97,12 @@ public SpiQuery<?> createQuery(SpiEbeanServer server) {
  // potentially changes the joins, selected properties, cache mode
  loadContext.configureQuery(query);
  if (onlyIds) {
- // lazy loading invoked via clear() and removeAll()
- query.select(many.targetIdProperty());
+ String mapKey = many.mapKey();
+ if (mapKey != null) {
+ query.select(mapKey);
+ } else {
+ query.select(many.targetIdProperty());
+ }
  }
  return query;
  }