mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-17 22:56:28 +00:00
Possible fix
This commit is contained in:
1 parent
84c3008db1
commit
5544a2cc3e
6 files changed
+194
-70
No files matched your search
@@ -136,8 +136,7 @@ public class ElPropertyChain implements ElPropertyValue {
|
||||
|
||||
@Override
|
||||
public boolean containsFormulaWithJoin() {
|
||||
// Not cascading the check at this stage
|
||||
return false;
|
||||
return lastBeanProperty.containsFormulaWithJoin();
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -265,7 +265,9 @@ class CQueryBuilder {
|
||||
if (!countDistinct) {
|
||||
// minimise select clause for standard count
|
||||
if (manyWhereJoins.isFormulaWithJoin()) {
|
||||
query.select(manyWhereJoins.getFormulaProperties());
|
||||
// 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()));
|
||||
} else {
|
||||
query.setSelectId();
|
||||
}
|
||||
|
||||
@@ -296,6 +296,13 @@ public final class SqlTreeBuilder {
|
||||
SqlTreeNodeManyWhereJoin nodeJoin = new SqlTreeNodeManyWhereJoin(joinProp.getProperty(), beanProperty, joinProp.getSqlJoinType());
|
||||
myJoinList.add(nodeJoin);
|
||||
}
|
||||
if (manyWhereJoins.isFormulaWithJoin()) {
|
||||
for (String property: manyWhereJoins.getFormulaJoinProperties()) {
|
||||
STreeProperty beanProperty = desc.findPropertyFromPath(property);
|
||||
SqlTreeNodeFormulaWhereJoin nodeJoin = new SqlTreeNodeFormulaWhereJoin(beanProperty, SqlJoinType.OUTER);
|
||||
myJoinList.add(nodeJoin);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private SqlTreeNode buildNode(String prefix, STreePropertyAssoc prop, STreeType desc, List<SqlTreeNode> myList, SqlTreeProperties props) {
|
||||
|
||||
@@ -0,0 +1,115 @@
|
||||
package io.ebeaninternal.server.query;
|
||||
|
||||
import io.ebean.Version;
|
||||
import io.ebean.bean.EntityBean;
|
||||
import io.ebeaninternal.api.SpiQuery;
|
||||
import io.ebeaninternal.server.deploy.DbReadContext;
|
||||
import io.ebeaninternal.server.deploy.DbSqlContext;
|
||||
import io.ebeaninternal.server.type.ScalarType;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Set;
|
||||
|
||||
/**
|
||||
* Join to Many (or child of a many) to support where clause predicates on many properties.
|
||||
*/
|
||||
class SqlTreeNodeFormulaWhereJoin implements SqlTreeNode {
|
||||
|
||||
private final STreeProperty nodeBeanProp;
|
||||
|
||||
/**
|
||||
* The many where join which is either INNER or OUTER.
|
||||
*/
|
||||
private final SqlJoinType manyJoinType;
|
||||
|
||||
SqlTreeNodeFormulaWhereJoin(STreeProperty prop, SqlJoinType manyJoinType) {
|
||||
this.nodeBeanProp = prop;
|
||||
this.manyJoinType = manyJoinType;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isSingleProperty() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ScalarType<?> getSingleAttributeReader() {
|
||||
throw new IllegalStateException("No expected");
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addAsOfTableAlias(SpiQuery<?> query) {
|
||||
// do nothing here ...
|
||||
}
|
||||
|
||||
@Override
|
||||
public void addSoftDeletePredicate(SpiQuery<?> query) {
|
||||
// do nothing here ...
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAggregation() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void appendDistinctOn(DbSqlContext ctx, boolean subQuery) {
|
||||
// do nothing here ...
|
||||
}
|
||||
|
||||
@Override
|
||||
public void appendGroupBy(DbSqlContext ctx, boolean subQuery) {
|
||||
// do nothing here
|
||||
}
|
||||
|
||||
/**
|
||||
* Append to the FROM clause for this node.
|
||||
*/
|
||||
@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
|
||||
}
|
||||
|
||||
@Override
|
||||
public void buildRawSqlSelectChain(List<String> selectChain) {
|
||||
// nothing to add
|
||||
}
|
||||
|
||||
@Override
|
||||
public void appendSelect(DbSqlContext ctx, boolean subQuery) {
|
||||
// nothing to do here
|
||||
}
|
||||
|
||||
@Override
|
||||
public void appendWhere(DbSqlContext ctx) {
|
||||
// nothing to do here
|
||||
}
|
||||
|
||||
@Override
|
||||
public EntityBean load(DbReadContext ctx, EntityBean localBean, EntityBean parentBean) {
|
||||
// nothing to do here
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public <T> Version<T> loadVersion(DbReadContext ctx) {
|
||||
// nothing to do here
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean hasMany() {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user