mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-19 23:02:24 +00:00
#715 - isNull() expression on @OneToMany or @ManyToMany produces incorrect SQL - should translate this to be same as isEmpty() and result in exists subquery
This commit is contained in:
1 parent
0510304c0f
commit
a20822a9e1
12 files changed
+171
-55
No files matched your search
@@ -129,13 +129,20 @@ public final class BeanFkeyProperty implements ElPropertyValue {
|
||||
throw new RuntimeException("Not Supported or Expected");
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAssocMany() {
|
||||
return false;
|
||||
}
|
||||
|
||||
/**
|
||||
* Returns false as not an AssocOne.
|
||||
*/
|
||||
@Override
|
||||
public boolean isAssocId() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAssocProperty() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@@ -888,6 +888,12 @@ public class BeanProperty implements ElPropertyValue, Property {
|
||||
return null;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAssocMany() {
|
||||
// Returns false - override in BeanPropertyAssocMany.
|
||||
return false;
|
||||
}
|
||||
|
||||
public boolean isAssocId() {
|
||||
// Returns false - override in BeanPropertyAssocOne.
|
||||
return false;
|
||||
|
||||
@@ -549,6 +549,11 @@ public class BeanPropertyAssocMany<T> extends BeanPropertyAssoc<T> {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAssocMany() {
|
||||
return true;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAssocId() {
|
||||
return true;
|
||||
|
||||
@@ -178,6 +178,11 @@ public class ElPropertyChain implements ElPropertyValue {
|
||||
return lastElPropertyValue.getAssocIdInValueExpr(size);
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAssocMany() {
|
||||
return lastElPropertyValue.isAssocMany();
|
||||
}
|
||||
|
||||
public boolean isAssocId() {
|
||||
return assocId;
|
||||
}
|
||||
|
||||
@@ -31,6 +31,11 @@ public interface ElPropertyValue extends ElPropertyDeploy, ExpressionPath {
|
||||
*/
|
||||
boolean isAssocId();
|
||||
|
||||
/**
|
||||
* Return true if the property is a OneToMany or ManyToMany associated bean property.
|
||||
*/
|
||||
boolean isAssocMany();
|
||||
|
||||
/**
|
||||
* Return true if any path of this path contains a Associated One or Many.
|
||||
*/
|
||||
|
||||
+7
-11
@@ -111,6 +111,7 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
|
||||
|
||||
@Override
|
||||
public void containsMany(BeanDescriptor<?> desc, ManyWhereJoins whereManyJoins) {
|
||||
list = buildExpressions(desc);
|
||||
if (list != null) {
|
||||
for (int i = 0; i < list.size(); i++) {
|
||||
list.get(i).containsMany(desc, whereManyJoins);
|
||||
@@ -118,6 +119,11 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void prepareExpression(BeanQueryRequest<?> request) {
|
||||
// do nothing
|
||||
}
|
||||
|
||||
@Override
|
||||
public ExampleExpression includeZeros() {
|
||||
includeZeros = true;
|
||||
@@ -194,11 +200,6 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void prepareExpression(BeanQueryRequest<?> request) {
|
||||
list = buildExpressions(request);
|
||||
}
|
||||
|
||||
/**
|
||||
* Return a hash for AutoTune query identification.
|
||||
*/
|
||||
@@ -259,15 +260,10 @@ public class DefaultExampleExpression implements SpiExpression, ExampleExpressio
|
||||
/**
|
||||
* Build the List of expressions.
|
||||
*/
|
||||
private ArrayList<SpiExpression> buildExpressions(BeanQueryRequest<?> request) {
|
||||
private ArrayList<SpiExpression> buildExpressions(BeanDescriptor<?> beanDescriptor) {
|
||||
|
||||
ArrayList<SpiExpression> list = new ArrayList<SpiExpression>();
|
||||
|
||||
OrmQueryRequest<?> r = (OrmQueryRequest<?>) request;
|
||||
BeanDescriptor<?> beanDescriptor = r.getBeanDescriptor();
|
||||
|
||||
addExpressions(list, beanDescriptor, entity, null);
|
||||
|
||||
return list;
|
||||
}
|
||||
|
||||
|
||||
@@ -50,10 +50,17 @@ class IsEmptyExpression extends AbstractExpression {
|
||||
throw new IllegalStateException("Property [" + propName + "] not found");
|
||||
}
|
||||
|
||||
isEmptySql(request, prop, empty, propertyPath);
|
||||
}
|
||||
|
||||
/**
|
||||
* Append an exists subQuery for the property.
|
||||
*/
|
||||
static void isEmptySql(SpiExpressionRequest request, ElPropertyValue prop, boolean empty, String propertyPath) {
|
||||
|
||||
if (empty) {
|
||||
request.append("not ");
|
||||
}
|
||||
|
||||
request
|
||||
.append("exists (select 1 from ")
|
||||
.append(prop.getAssocIsEmpty(request, propertyPath))
|
||||
|
||||
@@ -1,25 +1,50 @@
|
||||
package com.avaje.ebeaninternal.server.expression;
|
||||
|
||||
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
|
||||
import com.avaje.ebeaninternal.api.ManyWhereJoins;
|
||||
import com.avaje.ebeaninternal.api.SpiExpression;
|
||||
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
|
||||
import com.avaje.ebeaninternal.server.deploy.BeanDescriptor;
|
||||
import com.avaje.ebeaninternal.server.el.ElPropertyValue;
|
||||
import com.avaje.ebeaninternal.server.query.SplitName;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
|
||||
/**
|
||||
* Slightly redundant as Query.setId() ultimately also does the same job.
|
||||
* Null / Not Null expression.
|
||||
* <p>
|
||||
* Note that for OneToMany/ManyToMany this effectively gets translated into isEmpty()/isNotEmpty().
|
||||
* </p>
|
||||
*/
|
||||
class NullExpression extends AbstractExpression {
|
||||
|
||||
private final boolean notNull;
|
||||
|
||||
private ElPropertyValue elProperty;
|
||||
|
||||
private boolean assocMany;
|
||||
|
||||
private String propertyPath;
|
||||
|
||||
NullExpression(String propertyName, boolean notNull) {
|
||||
super(propertyName);
|
||||
this.notNull = notNull;
|
||||
}
|
||||
|
||||
@Override
|
||||
public void containsMany(BeanDescriptor<?> desc, ManyWhereJoins manyWhereJoin) {
|
||||
elProperty = desc.getElGetValue(propName);
|
||||
if (elProperty != null && elProperty.isAssocMany()) {
|
||||
// it is OneToMany or ManyToMany so going to be treated as isEmpty() expression
|
||||
assocMany = true;
|
||||
propertyPath = SplitName.split(propName)[0];
|
||||
propertyContainsMany(propertyPath, desc, manyWhereJoin);
|
||||
} else {
|
||||
propertyContainsMany(propName, desc, manyWhereJoin);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeDocQuery(DocQueryContext context) throws IOException {
|
||||
context.writeExists(notNull, propName);
|
||||
@@ -33,17 +58,18 @@ class NullExpression extends AbstractExpression {
|
||||
@Override
|
||||
public void addSql(SpiExpressionRequest request) {
|
||||
|
||||
String propertyName = propName;
|
||||
|
||||
String nullExpr = notNull ? " is not null " : " is null ";
|
||||
|
||||
ElPropertyValue prop = getElProp(request);
|
||||
if (prop != null && prop.isAssocId()) {
|
||||
request.append(prop.getAssocIdExpression(propertyName, nullExpr));
|
||||
if (assocMany) {
|
||||
// translate to exists subquery
|
||||
IsEmptyExpression.isEmptySql(request, elProperty, !notNull, propertyPath);
|
||||
return;
|
||||
}
|
||||
|
||||
request.append(propertyName).append(nullExpr);
|
||||
String nullExpr = notNull ? " is not null " : " is null ";
|
||||
if (elProperty != null && elProperty.isAssocId()) {
|
||||
request.append(elProperty.getAssocIdExpression(propName, nullExpr));
|
||||
} else {
|
||||
request.append(propName).append(nullExpr);
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -86,6 +86,12 @@ public class CtCompoundPropertyElAdapter implements ElPropertyValue {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAssocMany() {
|
||||
return false;
|
||||
}
|
||||
|
||||
@Override
|
||||
public boolean isAssocId() {
|
||||
return false;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user