github/ebean
4
0 Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2026-11-12 22:41:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

FIX: OrderdColums did not work properly with cache

Browse Source
This commit is contained in:
Jonas Pöhler committed 2021-08-24 14:28:21 +02:00
1 parent 1e34d65675
commit f2a578cd76
5 files changed
+215 -6
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

ebean-core/src/main/java/io/ebeaninternal/server/deploy/BeanDescriptorCacheHelp.java
+6 -1
View File
@@ -294,8 +294,13 @@ final class BeanDescriptorCacheHelp<T> {
List<Object> idList = entry.getIdList();
bc.checkEmptyLazyLoad();
int i = 0;
for (Object id : idList) {
many.add(bc, targetDescriptor.createReference(readOnly, id, persistenceContext));
final EntityBean ref = targetDescriptor.createReference(readOnly, id, persistenceContext);
if (many.hasOrderColumn()) {
ref._ebean_getIntercept().setSortOrder(++i);
}
many.add(bc, ref);
}
return true;
}
ebean-core/src/main/java/io/ebeaninternal/server/persist/SaveManyBeans.java
+8 -5
View File
@@ -18,7 +18,6 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import static io.ebeaninternal.server.persist.DmlUtil.isNullOrZero;
@@ -165,11 +164,15 @@ public final class SaveManyBeans extends SaveManyBase {
if (many.hasJoinTable()) {
skipSavingThisBean = targetDescriptor.isReference(ebi);
} else {
if (orderColumn != null && !Objects.equals(sortOrder, orderColumn.getValue(detail))) {
orderColumn.setValue(detail, sortOrder);
ebi.setDirty(true);
int originalOrder = 0;
if (orderColumn != null) {
originalOrder = detail._ebean_getIntercept().getSortOrder();
if (sortOrder != originalOrder) {
detail._ebean_intercept().setSortOrder(sortOrder);
ebi.setDirty(true);
}
}
if (targetDescriptor.isReference(ebi)) {
if (targetDescriptor.isReference(ebi) && originalOrder == 0) {
// we can skip this one
skipSavingThisBean = true;
} else if (ebi.isNewOrDirty()) {