diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java index 089f2c058..a07970e8d 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenExpression.java @@ -14,21 +14,29 @@ class BetweenExpression extends AbstractExpression { private final Object valueLow; - BetweenExpression(String propertyName, Object valLo, Object valHigh) { + BetweenExpression(String propertyName, Object valueLow, Object valueHigh) { super(propertyName); - this.valueLow = valLo; - this.valueHigh = valHigh; + this.valueLow = valueLow; + this.valueHigh = valueHigh; + } + + private Object low() { + return NamedParamHelp.value(valueLow); + } + + private Object high() { + return NamedParamHelp.value(valueHigh); } @Override public void writeDocQuery(DocQueryContext context) throws IOException { - context.writeRange(propName, Op.GT_EQ, valueLow, Op.LT_EQ, valueHigh); + context.writeRange(propName, Op.GT_EQ, low(), Op.LT_EQ, high()); } @Override public void addBindValues(SpiExpressionRequest request) { - request.addBindValue(valueLow); - request.addBindValue(valueHigh); + request.addBindValue(low()); + request.addBindValue(high()); } @Override @@ -45,8 +53,8 @@ class BetweenExpression extends AbstractExpression { @Override public int queryBindHash() { - int hc = valueLow.hashCode(); - hc = hc * 31 + valueHigh.hashCode(); + int hc = low().hashCode(); + hc = hc * 31 + high().hashCode(); return hc; } @@ -63,7 +71,7 @@ class BetweenExpression extends AbstractExpression { @Override public boolean isSameByBind(SpiExpression other) { BetweenExpression that = (BetweenExpression) other; - return valueLow.equals(that.valueLow) - && valueHigh.equals(that.valueHigh); + return low().equals(that.low()) + && high().equals(that.high()); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java b/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java index 58a50efc3..1a5958989 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java +++ b/src/main/java/com/avaje/ebeaninternal/server/expression/BetweenPropertyExpression.java @@ -32,11 +32,15 @@ class BetweenPropertyExpression extends NonPrepareExpression { return propName; } + private Object val() { + return NamedParamHelp.value(value); + } + @Override public void writeDocQuery(DocQueryContext context) throws IOException { context.startBoolMust(); - context.writeSimple(Op.LT_EQ, lowProperty, value); - context.writeSimple(Op.GT_EQ, highProperty, value); + context.writeSimple(Op.LT_EQ, lowProperty, val()); + context.writeSimple(Op.GT_EQ, highProperty, val()); context.endBool(); } @@ -72,7 +76,7 @@ class BetweenPropertyExpression extends NonPrepareExpression { @Override public void addBindValues(SpiExpressionRequest request) { - request.addBindValue(value); + request.addBindValue(val()); } @Override @@ -89,7 +93,7 @@ class BetweenPropertyExpression extends NonPrepareExpression { @Override public int queryBindHash() { - return value.hashCode(); + return val().hashCode(); } @Override @@ -106,6 +110,6 @@ class BetweenPropertyExpression extends NonPrepareExpression { @Override public boolean isSameByBind(SpiExpression other) { BetweenPropertyExpression that = (BetweenPropertyExpression) other; - return value.equals(that.value); + return val().equals(that.val()); } } diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java index 17f2e74a1..ddfc5a20b 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java +++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapter.java @@ -108,7 +108,13 @@ class EqlAdapter extends EQLBaseListener { @Override public void enterPropertyBetween_expression(EQLParser.PropertyBetween_expressionContext ctx) { - + checkChildren(ctx, 5); + String rawValue = ctx.getChild(0).getText(); + EqlOperator op = getOperator(ctx); + if (op != EqlOperator.BETWEEN) { + throw new IllegalStateException("Expecting BETWEEN operator but got "+op); + } + helper.addBetweenProperty(rawValue, ctx.getChild(2).getText(), ctx.getChild(4).getText()); } @Override diff --git a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java index 9b15daf05..1733d132f 100644 --- a/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java +++ b/src/main/java/com/avaje/ebeaninternal/server/grammer/EqlAdapterHelper.java @@ -41,6 +41,10 @@ class EqlAdapterHelper { } } + protected void addBetweenProperty(String rawValue, String lowProperty, String highProperty) { + peekExprList().betweenProperties(lowProperty, highProperty, bind(rawValue)); + } + protected void addBetween(String path, String value1, String value2) { peekExprList().between(path, bind(value1), bind(value2)); } diff --git a/src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java b/src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java index e74212a4a..ab8d084bd 100644 --- a/src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java +++ b/src/test/java/com/avaje/ebeaninternal/server/grammer/EqlParserTest.java @@ -133,6 +133,36 @@ public class EqlParserTest { assertThat(query.getGeneratedSql()).contains("where t0.name between ? and ? "); } + @Test + public void where_between_withNamedParams() throws Exception { + + Query query = parse("where name between :one and :two"); + query.setParameter("one", "a"); + query.setParameter("two", "b"); + query.findList(); + + assertThat(query.getGeneratedSql()).contains("where t0.name between ? and ? "); + } + + @Test + public void where_betweenProperty() throws Exception { + + Query query = parse("where 'x' between name and smallnote"); + query.findList(); + + assertThat(query.getGeneratedSql()).contains("where ? between t0.name and t0.smallnote"); + } + + @Test + public void where_betweenProperty_withNamed() throws Exception { + + Query query = parse("where :some between name and smallnote"); + query.setParameter("some", "A"); + query.findList(); + + assertThat(query.getGeneratedSql()).contains("where ? between t0.name and t0.smallnote"); + } + private Query parse(String raw) { Query query = Ebean.find(Customer.class);