Merge branch 'cannot-access-referenced-prop' of https://github.com/FOCONIS/ebean into FOCONIS-cannot-access-referenced-prop

This commit is contained in:
rob bygrave
2019-07-18 23:48:47 +12:00
5 changed files with 206 additions and 3 deletions
@@ -248,10 +248,14 @@ public final class SqlTreeBuilder {
List<SqlTreeNode> myJoinList = new ArrayList<>();
List<STreePropertyAssocOne> extraProps = new ArrayList<>();
for (STreePropertyAssocOne one : desc.propsOne()) {
String propPrefix = SplitName.add(prefix, one.getName());
if (isIncludeBean(propPrefix)) {
selectIncludes.add(propPrefix);
if (!one.hasForeignKey()) {
extraProps.add(one);
}
buildSelectChain(propPrefix, one, one.target(), myJoinList);
}
}
@@ -273,6 +277,7 @@ public final class SqlTreeBuilder {
}
addManyWhereJoins(myJoinList);
}
extraProps.forEach(props::add);
SqlTreeNode selectNode = buildNode(prefix, prop, desc, myJoinList, props);
if (joinList != null) {