#2847 - Add support for Sub-query EQ, NE, LT, LE, GT, GE expressions

This commit is contained in:
Rob Bygrave committed 2022-11-03 00:22:48 +13:00
1 parent 6f5e144a93
commit 0a61852711
18 files changed
+373 -62

No files matched your search

@@ -103,14 +103,14 @@ public interface SpiQuery<T> extends Query<T>, SpiQueryFetch, TxnProfileEventCod
COUNT(FIND_COUNT, "findCount"),
/**
* A subquery used as part of an exists where clause.
* A sub-query used as part of an exists where clause.
*/
SQ_EXISTS(FIND_SUBQUERY, "sqExists", false, false),
/**
* A subquery used as part of an in where clause.
* A sub-query expression used as part of where clause.
*/
SQ_IN(FIND_SUBQUERY, "sqIn", false, false),
SQ_EX(FIND_SUBQUERY, "sqEx", false, false),
/**
* Delete query.
@@ -1,21 +1,11 @@
package io.ebeaninternal.server.expression;
import io.ebean.ExampleExpression;
import io.ebean.Expression;
import io.ebean.ExpressionFactory;
import io.ebean.ExpressionList;
import io.ebean.Junction;
import io.ebean.LikeType;
import io.ebean.Pairs;
import io.ebean.Query;
import io.ebean.*;
import io.ebean.bean.EntityBean;
import io.ebean.search.Match;
import io.ebean.search.MultiMatch;
import io.ebean.search.TextCommonTerms;
import io.ebean.search.TextQueryString;
import io.ebean.search.TextSimple;
import io.ebean.search.*;
import io.ebeaninternal.api.SpiExpressionFactory;
import io.ebeaninternal.api.SpiQuery;
import io.ebeaninternal.server.expression.SubQueryExpression.SQOp;
import io.ebeaninternal.server.grammer.EqlParser;
import java.util.Arrays;
@@ -157,6 +147,11 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
EqlParser.parseWhere(expressions, list, this, params);
}
@Override
public Expression eq(String propertyName, Query<?> subQuery) {
return new SubQueryExpression(SQOp.EQ, propertyName, (SpiQuery<?>) subQuery);
}
/**
* Equal To - property equal to the given value.
*/
@@ -173,6 +168,11 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
return or(eq(propertyName, value), isNull(propertyName));
}
@Override
public Expression ne(String propertyName, Query<?> subQuery) {
return new SubQueryExpression(SQOp.NE, propertyName, (SpiQuery<?>) subQuery);
}
/**
* Not Equal To - property not equal to the given value.
*/
@@ -258,6 +258,11 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
return new BetweenPropertyExpression(lowProperty, highProperty, value);
}
@Override
public Expression gt(String propertyName, Query<?> subQuery) {
return new SubQueryExpression(SQOp.GT, propertyName, (SpiQuery<?>) subQuery);
}
/**
* Greater Than - property greater than the given value.
*/
@@ -279,6 +284,11 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
return or(ge(propertyName, value), isNull(propertyName));
}
@Override
public Expression ge(String propertyName, Query<?> subQuery) {
return new SubQueryExpression(SQOp.GE, propertyName, (SpiQuery<?>) subQuery);
}
/**
* Greater Than or Equal to - property greater than or equal to the given
* value.
@@ -301,6 +311,11 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
return or(le(propertyName, value), isNull(propertyName));
}
@Override
public Expression lt(String propertyName, Query<?> subQuery) {
return new SubQueryExpression(SQOp.LT, propertyName, (SpiQuery<?>) subQuery);
}
/**
* Less Than - property less than the given value.
*/
@@ -309,6 +324,11 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
return new SimpleExpression(propertyName, Op.LT, value);
}
@Override
public Expression le(String propertyName, Query<?> subQuery) {
return new SubQueryExpression(SQOp.LE, propertyName, (SpiQuery<?>) subQuery);
}
/**
* Less Than or Equal to - property less than or equal to the given value.
*/
@@ -465,7 +485,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
*/
@Override
public Expression in(String propertyName, Query<?> subQuery) {
return new InQueryExpression(propertyName, (SpiQuery<?>) subQuery, false);
return new SubQueryExpression(SQOp.IN, propertyName, (SpiQuery<?>) subQuery);
}
/**
@@ -507,7 +527,7 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
*/
@Override
public Expression notIn(String propertyName, Query<?> subQuery) {
return new InQueryExpression(propertyName, (SpiQuery<?>) subQuery, true);
return new SubQueryExpression(SQOp.NOTIN, propertyName, (SpiQuery<?>) subQuery);
}
/**
@@ -788,6 +788,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
return add(expr.bitwiseAnd(propertyName, flags, match));
}
@Override
public ExpressionList<T> eq(String propertyName, Query<?> subQuery) {
return add(expr.eq(propertyName, subQuery));
}
@Override
public ExpressionList<T> eq(String propertyName, Object value) {
return add(expr.eq(propertyName, value));
@@ -813,6 +818,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
return add(expr.ine(propertyName, value));
}
@Override
public ExpressionList<T> ne(String propertyName, Query<?> subQuery) {
return add(expr.ne(propertyName, subQuery));
}
@Override
public ExpressionList<T> ne(String propertyName, Object value) {
return add(expr.ne(propertyName, value));
@@ -863,10 +873,19 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
return add(expr.endsWith(propertyName, value));
}
@Override
public ExpressionList<T> ge(String propertyName, Query<?> subQuery) {
return add(expr.ge(propertyName, subQuery));
}
@Override
public ExpressionList<T> ge(String propertyName, Object value) {
add(expr.ge(propertyName, value));
return this;
return add(expr.ge(propertyName, value));
}
@Override
public ExpressionList<T> gt(String propertyName, Query<?> subQuery) {
return add(expr.gt(propertyName, subQuery));
}
@Override
@@ -876,14 +895,12 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
@Override
public ExpressionList<T> gtOrNull(String propertyName, Object value) {
add(expr.gtOrNull(propertyName, value));
return this;
return add(expr.gtOrNull(propertyName, value));
}
@Override
public ExpressionList<T> geOrNull(String propertyName, Object value) {
add(expr.geOrNull(propertyName, value));
return this;
return add(expr.geOrNull(propertyName, value));
}
@Override
@@ -999,6 +1016,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
return add(expr.istartsWith(propertyName, value));
}
@Override
public ExpressionList<T> le(String propertyName, Query<?> subQuery) {
return add(expr.le(propertyName, subQuery));
}
@Override
public ExpressionList<T> le(String propertyName, Object value) {
return add(expr.le(propertyName, value));
@@ -1019,6 +1041,11 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
return add(expr.like(propertyName, value));
}
@Override
public ExpressionList<T> lt(String propertyName, Query<?> subQuery) {
return add(expr.lt(propertyName, subQuery));
}
@Override
public ExpressionList<T> lt(String propertyName, Object value) {
return add(expr.lt(propertyName, value));
@@ -309,6 +309,11 @@ final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expr
return exprList.endsWith(propertyName, value);
}
@Override
public ExpressionList<T> eq(String propertyName, Query<?> subQuery) {
return exprList.eq(propertyName, subQuery);
}
@Override
public ExpressionList<T> eq(String propertyName, Object value) {
return exprList.eq(propertyName, value);
@@ -642,11 +647,21 @@ final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expr
return exprList.bitwiseNot(propertyName, flags);
}
@Override
public ExpressionList<T> ge(String propertyName, Query<?> subQuery) {
return exprList.ge(propertyName, subQuery);
}
@Override
public ExpressionList<T> ge(String propertyName, Object value) {
return exprList.ge(propertyName, value);
}
@Override
public ExpressionList<T> gt(String propertyName, Query<?> subQuery) {
return exprList.gt(propertyName, subQuery);
}
@Override
public ExpressionList<T> gt(String propertyName, Object value) {
return exprList.gt(propertyName, value);
@@ -787,6 +802,11 @@ final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expr
return exprList.istartsWith(propertyName, value);
}
@Override
public ExpressionList<T> le(String propertyName, Query<?> subQuery) {
return exprList.le(propertyName, subQuery);
}
@Override
public ExpressionList<T> le(String propertyName, Object value) {
return exprList.le(propertyName, value);
@@ -797,6 +817,11 @@ final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expr
return exprList.like(propertyName, value);
}
@Override
public ExpressionList<T> lt(String propertyName, Query<?> subQuery) {
return exprList.lt(propertyName, subQuery);
}
@Override
public ExpressionList<T> lt(String propertyName, Object value) {
return exprList.lt(propertyName, value);
@@ -812,6 +837,11 @@ final class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expr
return exprList.leOrNull(propertyName, value);
}
@Override
public ExpressionList<T> ne(String propertyName, Query<?> subQuery) {
return exprList.ne(propertyName, subQuery);
}
@Override
public ExpressionList<T> ne(String propertyName, Object value) {
return exprList.ne(propertyName, value);
@@ -8,32 +8,47 @@ import io.ebeaninternal.server.query.CQuery;
import java.util.List;
/**
* In expression using a sub query.
* Sub-Query expression.
*/
final class InQueryExpression extends AbstractExpression implements UnsupportedDocStoreExpression {
final class SubQueryExpression extends AbstractExpression implements UnsupportedDocStoreExpression {
private final boolean not;
enum SQOp {
EQ(" = "),
NE(" <> "),
GT(" > "),
GE(" >= "),
LT(" < "),
LE(" <= "),
IN(" in "),
NOTIN(" not in ");
final String expression;
SQOp(String expression) {
this.expression = expression;
}
}
private final SQOp op;
private final SpiQuery<?> subQuery;
private List<Object> bindParams;
private String sql;
InQueryExpression(String propertyName, SpiQuery<?> subQuery, boolean not) {
SubQueryExpression(SQOp op, String propertyName, SpiQuery<?> subQuery) {
super(propertyName);
this.op = op;
this.subQuery = subQuery;
this.not = not;
}
InQueryExpression(String propertyName, boolean not, String sql, List<Object> bindParams) {
SubQueryExpression(SQOp op, String propertyName, String sql, List<Object> bindParams) {
super(propertyName);
this.op = op;
this.subQuery = null;
this.not = not;
this.sql = sql;
this.bindParams = bindParams;
}
@Override
public SpiExpression copy() {
return subQuery == null ? this : new InQueryExpression(propName, subQuery.copy(), not);
return subQuery == null ? this : new SubQueryExpression(op, propName, subQuery.copy());
}
@Override
@@ -55,8 +70,8 @@ final class InQueryExpression extends AbstractExpression implements UnsupportedD
@Override
public void queryPlanHash(StringBuilder builder) {
builder.append("InQuery[").append(propName)
.append(" not:").append(not).append(" sql:").append(sql)
builder.append("SubQuery[").append(propName).append(op.expression)
.append(" sql:").append(sql)
.append(" ?:").append(bindParams.size()).append("]");
}
@@ -65,7 +80,7 @@ final class InQueryExpression extends AbstractExpression implements UnsupportedD
*/
private CQuery<?> compileSubQuery(BeanQueryRequest<?> queryRequest) {
SpiEbeanServer ebeanServer = (SpiEbeanServer) queryRequest.database();
return ebeanServer.compileQuery(Type.SQ_IN, subQuery, queryRequest.transaction());
return ebeanServer.compileQuery(Type.SQ_EX, subQuery, queryRequest.transaction());
}
@Override
@@ -75,13 +90,7 @@ final class InQueryExpression extends AbstractExpression implements UnsupportedD
@Override
public void addSql(SpiExpressionRequest request) {
request.append(propName);
if (not) {
request.append(" not");
}
request.append(" in (");
request.append(sql);
request.append(")");
request.append(propName).append(op.expression).append("(").append(sql).append(")");
}
@Override
@@ -93,7 +102,7 @@ final class InQueryExpression extends AbstractExpression implements UnsupportedD
@Override
public boolean isSameByBind(SpiExpression other) {
InQueryExpression that = (InQueryExpression) other;
SubQueryExpression that = (SubQueryExpression) other;
if (this.bindParams.size() != that.bindParams.size()) {
return false;
}
@@ -86,7 +86,7 @@ public final class SqlTreeBuilder {
this.disableLazyLoad = query.isDisableLazyLoading();
this.readOnly = Boolean.TRUE.equals(query.isReadOnly());
this.subQuery = Type.SQ_EXISTS == query.getType()
|| Type.SQ_IN == query.getType()
|| Type.SQ_EX == query.getType()
|| Type.ID_LIST == query.getType()
|| Type.DELETE == query.getType()
|| query.isCountDistinct();