#3463 - Ignore queryBean.select(null) calls (#3464)

ebean-orm · Aug 27, 2024 · f896470 · f896470
1 parent 86c7de2
commit f896470
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 1 deletion.
diff --git a/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java b/ebean-core/src/main/java/io/ebeaninternal/server/querydefn/DefaultOrmQuery.java
@@ -1367,7 +1367,9 @@ public final Query<T> select(String columns) {
 
  @Override
  public final Query<T> select(FetchGroup<T> fetchGroup) {
- this.detail = ((SpiFetchGroup<T>) fetchGroup).detail();
+ if (fetchGroup != null) {
+ this.detail = ((SpiFetchGroup<T>) fetchGroup).detail();
+ }
  return this;
  }
 

diff --git a/ebean-querybean/src/test/java/org/querytest/QOrderTest.java b/ebean-querybean/src/test/java/org/querytest/QOrderTest.java
@@ -142,6 +142,22 @@ void fetchCache() {
  .findList();
  }
 
+ @Test
+ void viaNullFetchGraph() {
+ DB.getDefault();
+ LoggedSql.start();
+
+ FetchGroup<Order> fg = null;
+ new QOrder()
+ .select(fg)
+ .status.eq(Order.Status.NEW)
+ .findList();
+
+ final List<String> sql = LoggedSql.stop();
+ assertThat(sql).hasSize(1);
+ assertThat(sql.get(0)).contains("select /* QOrderTest.viaNullFetchGraph */ t0.id, ");
+ }
+
  @Test
  void viaFetchGraph() {