You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ofbiz.apache.org by do...@apache.org on 2011/06/26 20:11:06 UTC
svn commit: r1139884 -
/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java
Author: doogie
Date: Sun Jun 26 18:11:06 2011
New Revision: 1139884
URL: http://svn.apache.org/viewvc?rev=1139884&view=rev
Log:
FIX: Add the sql excludes to the dynamic view.
Modified:
ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java
Modified: ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java
URL: http://svn.apache.org/viewvc/ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java?rev=1139884&r1=1139883&r2=1139884&view=diff
==============================================================================
--- ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java (original)
+++ ofbiz/trunk/framework/entity/src/org/ofbiz/entity/sql/EntityPlanner.java Sun Jun 26 18:11:06 2011
@@ -82,8 +82,14 @@ public class EntityPlanner extends Plann
addMember(dve, table.getTableName());
addJoined(dve, table.getTableName().getAlias(), table.getJoined());
for (FieldAll fieldAll: selectGroup.getFieldAlls()) {
- // FIXME: handle excludes
- dve.addAliasAll(fieldAll.getAlias(), null, null);
+ List<String> excludes = FastList.newInstance();
+ for (String exclude: fieldAll) {
+ excludes.add(exclude);
+ }
+ if (excludes.isEmpty()) {
+ excludes = null;
+ }
+ dve.addAliasAll(fieldAll.getAlias(), null, excludes);
}
for (Relation relation: selectStatement.getRelations().values()) {
dve.addRelation(relation.getType(), relation.getTitle(), relation.getEntityName(), buildKeyMaps(relation));