Author: lektran
Date: Mon Mar 28 22:43:15 2016
New Revision: 1736931
URL: http://svn.apache.org/viewvc?rev=1736931&view=rev
Log:
Merged from trunk r1736922:
Ensure a ModelField is set for rhs EntityConditionValues that don't already
have it, such as the EntityFunction classes
Modified:
ofbiz/branches/release12.04/.classpath
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java
Modified: ofbiz/branches/release12.04/.classpath
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/.classpath?rev=1736931&r1=1736930&r2=1736931&view=diff
==============================================================================
--- ofbiz/branches/release12.04/.classpath (original)
+++ ofbiz/branches/release12.04/.classpath Mon Mar 28 22:43:15 2016
@@ -67,7 +67,7 @@
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-beanutils-1.7.0.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-cli-1.0.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-codec-1.4.jar"/>
- <classpathentry kind="lib"
path="framework/base/lib/commons/commons-collections-3.2.1jar"/>
+ <classpathentry kind="lib"
path="framework/base/lib/commons/commons-collections-3.2.2.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-compress-1.4.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-digester-1.8.jar"/>
<classpathentry kind="lib"
path="framework/base/lib/commons/commons-discovery-0.4.jar"/>
@@ -142,9 +142,9 @@
<classpathentry kind="lib" path="framework/service/lib/wsdl4j-1.6.2.jar"/>
<classpathentry kind="lib"
path="framework/service/lib/axiom-api-1.2.14.jar"/>
<classpathentry kind="lib"
path="framework/service/lib/axiom-impl-1.2.14.jar"/>
- <classpathentry kind="lib"
path="framework/service/lib/axis2-kernel-1.5.2.jar"/>
- <classpathentry kind="lib"
path="framework/service/lib/axis2-transport-http-1.5.2.jar"/>
- <classpathentry kind="lib"
path="framework/service/lib/axis2-transport-local-1.5.2.jar"/>
+ <classpathentry kind="lib"
path="framework/service/lib/axis2-kernel-1.6.3.jar"/>
+ <classpathentry kind="lib"
path="framework/service/lib/axis2-transport-http-1.6.3.jar"/>
+ <classpathentry kind="lib"
path="framework/service/lib/axis2-transport-local-1.6.3.jar"/>
<classpathentry kind="lib"
path="framework/service/lib/commons-httpclient-3.1.jar"/>
<classpathentry kind="lib" path="framework/service/lib/neethi-3.0.2.jar"/>
<classpathentry kind="lib"
path="framework/service/lib/XmlSchema-1.4.3.jar"/>
Modified:
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java?rev=1736931&r1=1736930&r2=1736931&view=diff
==============================================================================
---
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java
(original)
+++
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityComparisonOperator.java
Mon Mar 28 22:43:15 2016
@@ -118,6 +118,9 @@ public abstract class EntityComparisonOp
protected void makeRHSWhereStringValue(ModelEntity entity,
List<EntityConditionParam> entityConditionParams, StringBuilder sql, ModelField
field, R rhs, DatasourceInfo 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);
Modified:
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java?rev=1736931&r1=1736930&r2=1736931&view=diff
==============================================================================
---
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java
(original)
+++
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityConditionSubSelect.java
Mon Mar 28 22:43:15 2016
@@ -132,6 +132,11 @@ public class EntityConditionSubSelect ex
}
@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
return null;
Modified:
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java?rev=1736931&r1=1736930&r2=1736931&view=diff
==============================================================================
---
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java
(original)
+++
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityConditionValue.java
Mon Mar 28 22:43:15 2016
@@ -38,6 +38,8 @@ public abstract class EntityConditionVal
public abstract ModelField getModelField(ModelEntity modelEntity);
+ public abstract void setModelField(ModelField modelEntity);
+
public void addSqlValue(StringBuilder sql, ModelEntity modelEntity,
List<EntityConditionParam> entityConditionParams, boolean
includeTableNamePrefix,
DatasourceInfo datasourceinfo) {
addSqlValue(sql, emptyAliases, modelEntity, entityConditionParams,
includeTableNamePrefix, datasourceinfo);
Modified:
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java?rev=1736931&r1=1736930&r2=1736931&view=diff
==============================================================================
---
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java
(original)
+++
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityFieldValue.java
Mon Mar 28 22:43:15 2016
@@ -135,6 +135,11 @@ public class EntityFieldValue extends En
}
@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, DatasourceInfo
datasourceInfo) {
if (this.modelViewEntity != null) {
// NOTE: this section is a bit of a hack; the other code is
terribly complex and really needs to be refactored to incorporate support for
this
Modified:
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java
URL:
http://svn.apache.org/viewvc/ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java?rev=1736931&r1=1736930&r2=1736931&view=diff
==============================================================================
---
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java
(original)
+++
ofbiz/branches/release12.04/framework/entity/src/org/ofbiz/entity/condition/EntityFunction.java
Mon Mar 28 22:43:15 2016
@@ -182,6 +182,7 @@ public abstract class EntityFunction<T e
protected EntityConditionValue nested = null;
protected Object value = null;
protected Fetcher<T> fetcher = null;
+ protected ModelField field;
protected EntityFunction() {}
@@ -275,10 +276,15 @@ public abstract class EntityFunction<T e
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) {
nested.validateSql(modelEntity);
