lxy/redkale
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
地平线
2015-06-01 13:03:45 +08:00
parent 2e1380f2c2
commit ff36fb9a82
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/com/wentch/redkale/source/FilterBeanNode.java
View File

@@ -89,7 +89,9 @@ final class FilterBeanNode extends FilterNode {
} }
newnode.foreignEntity = secinfo; newnode.foreignEntity = secinfo;
newnode.tabalis = alias; newnode.tabalis = alias;
newnode.foreignColumn = joinCol.column().isEmpty() ? secinfo.getPrimary().field() : joinCol.column(); newnode.foreignAttribute = joinCol.column().isEmpty() ? secinfo.getPrimary() : secinfo.getAttribute(joinCol.column());
if (newnode.foreignEntity != null && newnode.foreignAttribute == null) throw new RuntimeException(clazz.getName() + "." + field.getName() + " have illegal FilterJoinColumn " + joinCol);
joinallcached = false; //关联查询暂不支持缓存查询
} }
} }
//------------------------------------ //------------------------------------
@@ -139,7 +141,7 @@ final class FilterBeanNode extends FilterNode {
private EntityInfo foreignEntity; private EntityInfo foreignEntity;
private String foreignColumn; private Attribute foreignAttribute;
private boolean array; private boolean array;
@@ -194,7 +196,7 @@ final class FilterBeanNode extends FilterNode {
newnode.express = this.express; newnode.express = this.express;
newnode.nodes = this.nodes; newnode.nodes = this.nodes;
newnode.foreignEntity = this.foreignEntity; newnode.foreignEntity = this.foreignEntity;
newnode.foreignColumn = this.foreignColumn; newnode.foreignAttribute = this.foreignAttribute;
newnode.array = this.array; newnode.array = this.array;
newnode.collection = this.collection; newnode.collection = this.collection;
newnode.ignoreCase = this.ignoreCase; newnode.ignoreCase = this.ignoreCase;
@@ -211,7 +213,7 @@ final class FilterBeanNode extends FilterNode {
FilterBeanNode beanNode = ((FilterBeanNode) node); FilterBeanNode beanNode = ((FilterBeanNode) node);
this.beanAttribute = beanNode.beanAttribute; this.beanAttribute = beanNode.beanAttribute;
this.foreignEntity = beanNode.foreignEntity; this.foreignEntity = beanNode.foreignEntity;
this.foreignColumn = beanNode.foreignColumn; this.foreignAttribute = beanNode.foreignAttribute;
this.array = beanNode.array; this.array = beanNode.array;
this.collection = beanNode.collection; this.collection = beanNode.collection;
this.ignoreCase = beanNode.ignoreCase; this.ignoreCase = beanNode.ignoreCase;
@@ -232,7 +234,7 @@ final class FilterBeanNode extends FilterNode {
@Override @Override
protected boolean isJoinAllCached() { protected boolean isJoinAllCached() {
return false && joinallcached; //暂时没实现 return joinallcached; //暂时没实现
} }
@Override @Override