Merged from trunk r1736922:

Ensure a ModelField is set for rhs EntityConditionValues that don't already have it, such as the EntityFunction classes git-svn-id: https://svn.apache.org/repos/asf/ofbiz/branches/release13.07@1736930 13f79535-47bb-0310-9956-ffa450edef68
robotsc · Mar 28, 2016 · f94cd11 · f94cd11
1 parent f4a893f
commit f94cd11
Show file tree

Hide file tree

Showing 5 changed files with 28 additions and 1 deletion.
diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java b/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java
@@ -118,6 +118,9 @@ protected void makeRHSWhereString(ModelEntity entity, List<EntityConditionParam>
     protected void makeRHSWhereStringValue(ModelEntity entity, List<EntityConditionParam> entityConditionParams, StringBuilder sql, ModelField field, R rhs, Datasource datasourceInfo) {
         if (rhs instanceof EntityConditionValue) {
             EntityConditionValue ecv = (EntityConditionValue) rhs;
+            if (ecv.getModelField(entity) == null) {
+                ecv.setModelField(field);
+            }
             ecv.addSqlValue(sql, entity, entityConditionParams, false, datasourceInfo);
         } else {
             addValue(sql, field, rhs, entityConditionParams);

diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java
@@ -131,6 +131,11 @@ public ModelField getModelField(ModelEntity modelEntity) {
         return null;
     }
 
+    @Override
+    public void setModelField(ModelField modelEntity) {
+        // do nothing for now
+    }
+
     @Override
     public Comparable<?> getValue(Delegator delegator, Map<String, ? extends Object> map) {
         // do nothing for now

diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java b/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java
@@ -78,6 +78,11 @@ public ModelField getModelField(ModelEntity modelEntity) {
             return null;
         }
 
+        @Override
+        public void setModelField(ModelField field) {
+            // Do nothing;
+        }
+
         @Override
         public Object getValue(Delegator delegator, Map<String, ? extends Object> map) {
             return value;
@@ -100,6 +105,8 @@ public void visit(EntityConditionVisitor visitor) {
 
     public abstract ModelField getModelField(ModelEntity modelEntity);
 
+    public abstract void setModelField(ModelField modelEntity);
+
     public void addSqlValue(StringBuilder sql, ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams, boolean includeTableNamePrefix,
             Datasource datasourceinfo) {
         addSqlValue(sql, emptyAliases, modelEntity, entityConditionParams, includeTableNamePrefix, datasourceinfo);

diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java b/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java
@@ -122,6 +122,12 @@ public ModelField getModelField(ModelEntity modelEntity) {
         return getField(modelEntity, fieldName);
     }
 
+
+    @Override
+    public void setModelField(ModelField field) {
+        // do nothing
+    }
+
     @Override
     public void addSqlValue(StringBuilder sql, Map<String, String> tableAliases, ModelEntity modelEntity, List<EntityConditionParam> entityConditionParams, boolean includeTableNamePrefix, Datasource datasourceInfo) {
         if (this.modelViewEntity != null) {

diff --git a/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java b/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java
@@ -182,6 +182,7 @@ public void init(Object value) {
     protected EntityConditionValue nested = null;
     protected Object value = null;
     protected Fetcher<T> fetcher = null;
+    protected ModelField field;
 
     protected EntityFunction() {}
 
@@ -275,9 +276,14 @@ public ModelField getModelField(ModelEntity modelEntity) {
         if (nested != null) {
             return nested.getModelField(modelEntity);
         }
-        return null;
+        return field;
     }
 
+    @Override
+    public void setModelField(ModelField field) {
+        this.field = field;
+    }
+
     @Override
     public void validateSql(ModelEntity modelEntity) throws GenericModelException {
         if (nested != null) {