github/ebean
4
0
Fork 0
mirror of https://github.com/ebean-orm/ebean.git synced 2024-04-21 10:51:47 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #3206 from ebean-orm/feature/3173-beanMap-clear

Browse Source 
Map.clear() on a @OneToMany orphanRemoval=true invokes 1+N queries du…
This commit is contained in:
Rob Bygrave
2023-08-29 22:10:36 +12:00
committed by GitHub
parent 770eb06cab b6b8f77213
commit c83c85efc3
2 changed files with 44 additions and 39 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-core/src/main/java/io/ebeaninternal/api/LoadManyRequest.java
+6 -1
View File
@@ -111,7 +111,12 @@ public final class LoadManyRequest extends LoadRequest {
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;
}
ebean-test/src/test/java/org/tests/sets/TestO2MMap.java
+38 -38
View File
@@ -37,42 +37,42 @@ class TestO2MMap {
assertThat(sql.get(1)).contains("select t0.department_id, t0.id, t0.code, t0.name, t0.department_id from map_emp t0 where (t0.department_id)");
}
// @Test
// void beanSet_when_clear_thenAddSave() {
//
// final MapDepart department = new MapDepart("clearAndAdd");
// final MapEmp employee0 = new MapEmp("Init1", "Code0");
// final MapEmp employee1 = new MapEmp("Init2", "Code1");
// department.addEmployee(employee0);
// department.addEmployee(employee1);
// DB.save(department);
//
// LoggedSql.start();
//
// MapDepart dept = DB.find(MapDepart.class, department.getId());
//
// List<String> sql = LoggedSql.collect();
// assertThat(sql).hasSize(1);
// assertThat(sql.get(0)).contains("select t0.id, t0.name from map_depart t0 where t0.id = ?");
//
// Map<String, MapEmp> employees = dept.employees();
// employees.clear();
//
// sql = LoggedSql.collect();
// assertThat(sql).hasSize(1);
// assertThat(sql.get(0)).contains("select t0.department_id, t0.id, t0.code from map_emp t0 where (t0.department_id)");
//
// final MapEmp employee2 = new MapEmp("After1", "Code3");
// dept.addEmployee(employee2);
//
// DB.save(dept);
//
// sql = LoggedSql.collect();
// assertThat(sql).hasSize(5);
// assertThat(sql.get(0)).contains("delete from map_emp where id=?");
// assertThat(sql.get(1)).contains(" -- bind");
// assertThat(sql.get(2)).contains(" -- bind");
// assertThat(sql.get(3)).contains("insert into map_emp (code, name, department_id) values (?,?,?)");
// assertThat(sql.get(4)).contains(" -- bind");
// }
@Test
void beanMap_when_clear_thenAddSave() {
final MapDepart department = new MapDepart("clearAndAdd");
final MapEmp employee0 = new MapEmp("Init1", "Code0");
final MapEmp employee1 = new MapEmp("Init2", "Code1");
department.addEmployee(employee0);
department.addEmployee(employee1);
DB.save(department);
LoggedSql.start();
MapDepart dept = DB.find(MapDepart.class, department.getId());
List<String> sql = LoggedSql.collect();
assertThat(sql).hasSize(1);
assertThat(sql.get(0)).contains("select t0.id, t0.name from map_depart t0 where t0.id = ?");
Map<String, MapEmp> employees = dept.employees();
employees.clear();
sql = LoggedSql.collect();
assertThat(sql).hasSize(1);
assertThat(sql.get(0)).contains("select t0.department_id, t0.id, t0.code from map_emp t0 where (t0.department_id)");
final MapEmp employee2 = new MapEmp("After1", "Code3");
dept.addEmployee(employee2);
DB.save(dept);
sql = LoggedSql.collect();
assertThat(sql).hasSize(5);
assertThat(sql.get(0)).contains("delete from map_emp where id=?");
assertThat(sql.get(1)).contains(" -- bind");
assertThat(sql.get(2)).contains(" -- bind");
assertThat(sql.get(3)).contains("insert into map_emp (code, name, department_id) values (?,?,?)");
assertThat(sql.get(4)).contains(" -- bind");
}
}