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

Fix for select query with (*,x(y))

Browse Source
This commit is contained in:
Noemi Szemenyei
2021-11-10 16:11:42 +01:00
parent abf311de93
commit 6af2902ae3
2 changed files with 6 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ebean-core/src/main/java/io/ebeaninternal/server/querydefn/OrmQueryPropertiesParser.java
+4 -2
View File
@@ -38,8 +38,10 @@ final class OrmQueryPropertiesParser {
return ALL;
}
final Set<String> included = splitRawSelect(rawProperties);
final boolean selectAll = included.remove("*");
return new Response(selectAll, included);
if (included.contains("*")) {
return ALL;
}
return new Response(false, included);
}
/**
ebean-test/src/test/java/io/ebean/text/PathPropertiesTests.java
+2 -2
View File
@@ -223,8 +223,8 @@ public class PathPropertiesTests extends BaseTestCase {
Query<Customer> query = DB.find(Customer.class).apply(root);
query.findList();
List<String> sql = LoggedSql.stop();
assertThat(sql).hasSize(1);
assertThat(sql.get(0)).contains("select t0.status, t0.name, t0.smallnote, t0.anniversary, t0.id, t1.id, t1.line_1 from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id");
assertThat(sql).hasSize(1);
assertThat(sql.get(0)).contains("select t0.id, t0.status, t0.name, t0.smallnote, t0.anniversary, t0.cretime, t0.updtime, t0.version, t0.shipping_address_id, t1.id, t1.line_1 from o_customer t0 left join o_address t1 on t1.id = t0.billing_address_id;");
}
}