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

#1753 - Tidy for Issue with using the Formula-Properties

Browse Source
This commit is contained in:
rob bygrave
2019-07-14 16:03:07 +12:00
parent 1ffe359573
commit 496672b394
4 changed files with 38 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/main/java/io/ebeaninternal/server/query/CQueryBuilder.java
+2 -3
View File
@@ -265,9 +265,8 @@ class CQueryBuilder {
if (!countDistinct) {
// minimise select clause for standard count
if (manyWhereJoins.isFormulaWithJoin()) {
// FIXME: we join the strings here and on the other side we split them again
// this is not yet optimal
query.select(String.join(",",manyWhereJoins.getFormulaJoinProperties()));
// Note that this is not yet optimal (split and join)
query.select(String.join(",", manyWhereJoins.getFormulaJoinProperties()));
} else {
query.setSelectId();
}
src/main/java/io/ebeaninternal/server/query/SqlTreeBuilder.java
+1 -2
View File
@@ -299,8 +299,7 @@ public final class SqlTreeBuilder {
if (manyWhereJoins.isFormulaWithJoin()) {
for (String property: manyWhereJoins.getFormulaJoinProperties()) {
STreeProperty beanProperty = desc.findPropertyFromPath(property);
SqlTreeNodeFormulaWhereJoin nodeJoin = new SqlTreeNodeFormulaWhereJoin(beanProperty, SqlJoinType.OUTER);
myJoinList.add(nodeJoin);
myJoinList.add(new SqlTreeNodeFormulaWhereJoin(beanProperty, SqlJoinType.OUTER));
}
}
}
src/main/java/io/ebeaninternal/server/query/SqlTreeNodeFormulaWhereJoin.java
+2 -5
View File
@@ -67,18 +67,15 @@ class SqlTreeNodeFormulaWhereJoin implements SqlTreeNode {
*/
@Override
public void appendFrom(DbSqlContext ctx, SqlJoinType currentJoinType) {
// always use the join type as per this many where join
// (OUTER for disjunction and otherwise INNER)
nodeBeanProp.appendFrom(ctx, manyJoinType);
}
@Override
public void dependentTables(Set<String> tables) {
//FIXME: we cannot easily determine the dependent tables, this would require an enhancement
//of the @Formula(dependentTables=...) annotation
// FIXME: we cannot easily determine the dependent tables this would require an enhancement
// of the @Formula(dependentTables=...) annotation
}
@Override