Merge branch 'master' into wip/h2database-v2

This commit is contained in:
Rob Bygrave committed 2022-01-26 22:07:20 +13:00
commit 17df5a2c16
36 files changed
+681 -582

No files matched your search

@@ -24,8 +24,8 @@ public class DefaultServer_getReferenceTest extends BaseTestCase {
ResetBasicData.reset();
DB.execute(() -> {
Customer loaded = DB.find(Customer.class, 1);
Customer reference = DB.reference(Customer.class, 1);
Customer loaded = DB.find(Customer.class).where().eq("name", "Rob").findOne();
Customer reference = DB.reference(Customer.class, loaded.getId());
assertThat(loaded).isSameAs(reference);
});
}
@@ -1,6 +1,7 @@
package io.ebeaninternal.server.deploy;
import io.ebean.BaseTestCase;
import io.ebean.DB;
import io.ebean.bean.BeanCollection;
import io.ebean.bean.EntityBean;
import io.ebean.common.BeanList;
@@ -66,11 +67,13 @@ public class BeanPropertyAssocManyTest extends BaseTestCase {
ResetBasicData.reset();
List<Object> customerIds = new ArrayList<>();
customerIds.add(1L);
customerIds.add(2L);
List<Long> ids = DB.find(Customer.class).orderBy("id").setMaxRows(2).findIds();
List<Object> contactIdsForOne = contacts().findIdsByParentId(1L, null, null, null, true);
List<Object> customerIds = new ArrayList<>();
customerIds.add(ids.get(0));
customerIds.add(ids.get(1));
List<Object> contactIdsForOne = contacts().findIdsByParentId(ids.get(0), null, null, null, true);
List<Object> contactIdsForMultiple = contacts().findIdsByParentId(null, customerIds, null, null, true);