mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-19 23:02:24 +00:00
Initial add of SpiNamedParam
This commit is contained in:
1 parent
86faa947af
commit
1a1c432c2a
11 files changed
+153
-36
No files matched your search
@@ -251,6 +251,12 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
|
||||
return new DefaultExampleExpression(checkEntityBean(example), caseInsensitive, likeType);
|
||||
}
|
||||
|
||||
@Override
|
||||
public Expression like(LikeType likeType, String propertyName, Object value) {
|
||||
|
||||
return new LikeExpression(propertyName, value, true, LikeType.RAW);
|
||||
}
|
||||
|
||||
/**
|
||||
* Like - property like value where the value contains the SQL wild card
|
||||
* characters % (percentage) and _ (underscore).
|
||||
|
||||
@@ -4,28 +4,43 @@ import com.avaje.ebean.LikeType;
|
||||
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
|
||||
import com.avaje.ebeaninternal.api.SpiExpression;
|
||||
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
|
||||
import com.avaje.ebeaninternal.api.SpiNamedParam;
|
||||
import com.avaje.ebeaninternal.server.el.ElPropertyValue;
|
||||
|
||||
import java.io.IOException;
|
||||
|
||||
class LikeExpression extends AbstractExpression {
|
||||
|
||||
private final String val;
|
||||
private final Object value;
|
||||
|
||||
private final boolean caseInsensitive;
|
||||
|
||||
private final LikeType type;
|
||||
|
||||
LikeExpression(String propertyName, String value, boolean caseInsensitive, LikeType type) {
|
||||
LikeExpression(String propertyName, Object value, boolean caseInsensitive, LikeType type) {
|
||||
super(propertyName);
|
||||
this.caseInsensitive = caseInsensitive;
|
||||
this.type = type;
|
||||
this.val = value;
|
||||
this.value = value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the bind value taking into account named parameters.
|
||||
*/
|
||||
private Object value() {
|
||||
if (value instanceof SpiNamedParam) {
|
||||
return ((SpiNamedParam)value).getValue();
|
||||
}
|
||||
return value;
|
||||
}
|
||||
|
||||
private String val() {
|
||||
return value().toString();
|
||||
}
|
||||
|
||||
@Override
|
||||
public void writeDocQuery(DocQueryContext context) throws IOException {
|
||||
context.writeLike(propName, val, type, caseInsensitive);
|
||||
context.writeLike(propName, val(), type, caseInsensitive);
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -38,7 +53,7 @@ class LikeExpression extends AbstractExpression {
|
||||
request.addBindEncryptKey(encryptKey);
|
||||
}
|
||||
|
||||
String bindValue = getValue(val, caseInsensitive, type);
|
||||
String bindValue = getValue(val(), caseInsensitive, type);
|
||||
request.addBindValue(bindValue);
|
||||
}
|
||||
|
||||
@@ -74,7 +89,7 @@ class LikeExpression extends AbstractExpression {
|
||||
|
||||
@Override
|
||||
public int queryBindHash() {
|
||||
return val.hashCode();
|
||||
return val().hashCode();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -92,7 +107,7 @@ class LikeExpression extends AbstractExpression {
|
||||
@Override
|
||||
public boolean isSameByBind(SpiExpression other) {
|
||||
LikeExpression that = (LikeExpression) other;
|
||||
return val.equals(that.val);
|
||||
return val().equals(that.val());
|
||||
}
|
||||
|
||||
private static String getValue(String value, boolean caseInsensitive, LikeType type) {
|
||||
|
||||
@@ -5,6 +5,7 @@ import com.avaje.ebean.plugin.ExpressionPath;
|
||||
import com.avaje.ebeaninternal.api.HashQueryPlanBuilder;
|
||||
import com.avaje.ebeaninternal.api.SpiExpression;
|
||||
import com.avaje.ebeaninternal.api.SpiExpressionRequest;
|
||||
import com.avaje.ebeaninternal.api.SpiNamedParam;
|
||||
import com.avaje.ebeaninternal.server.el.ElPropertyValue;
|
||||
|
||||
import java.io.IOException;
|
||||
@@ -13,18 +14,28 @@ public class SimpleExpression extends AbstractExpression {
|
||||
|
||||
private final Op type;
|
||||
|
||||
private final Object value;
|
||||
private final Object val;
|
||||
|
||||
public SimpleExpression(String propertyName, Op type, Object value) {
|
||||
super(propertyName);
|
||||
this.type = type;
|
||||
this.value = value;
|
||||
this.val = value;
|
||||
}
|
||||
|
||||
/**
|
||||
* Return the bind value taking into account named parameters.
|
||||
*/
|
||||
private Object value() {
|
||||
if (val instanceof SpiNamedParam) {
|
||||
return ((SpiNamedParam)val).getValue();
|
||||
}
|
||||
return val;
|
||||
}
|
||||
|
||||
@Override
|
||||
public Object getIdEqualTo(String idName) {
|
||||
if (type == Op.EQ && idName.equals(propName)) {
|
||||
return value;
|
||||
return value();
|
||||
}
|
||||
return null;
|
||||
}
|
||||
@@ -37,13 +48,13 @@ public class SimpleExpression extends AbstractExpression {
|
||||
ExpressionPath prop = context.getExpressionPath(propName);
|
||||
if (prop != null && prop.isAssocId()) {
|
||||
String idName = prop.getAssocIdExpression(propName, "");
|
||||
Object[] ids = prop.getAssocIdValues((EntityBean) value);
|
||||
Object[] ids = prop.getAssocIdValues((EntityBean) value());
|
||||
if (ids == null || ids.length != 1) {
|
||||
throw new IllegalArgumentException("Expecting 1 Id value for " + idName + " but got " + ids);
|
||||
}
|
||||
context.writeSimple(type, idName, ids[0]);
|
||||
} else {
|
||||
context.writeSimple(type, propName, value);
|
||||
context.writeSimple(type, propName, value());
|
||||
}
|
||||
}
|
||||
|
||||
@@ -56,7 +67,7 @@ public class SimpleExpression extends AbstractExpression {
|
||||
}
|
||||
|
||||
public Object getValue() {
|
||||
return value;
|
||||
return value();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -65,7 +76,7 @@ public class SimpleExpression extends AbstractExpression {
|
||||
ElPropertyValue prop = getElProp(request);
|
||||
if (prop != null) {
|
||||
if (prop.isAssocId()) {
|
||||
Object[] ids = prop.getAssocIdValues((EntityBean) value);
|
||||
Object[] ids = prop.getAssocIdValues((EntityBean) value());
|
||||
if (ids != null) {
|
||||
for (int i = 0; i < ids.length; i++) {
|
||||
request.addBindValue(ids[i]);
|
||||
@@ -83,7 +94,7 @@ public class SimpleExpression extends AbstractExpression {
|
||||
// prop.getBeanProperty().getScalarType();
|
||||
}
|
||||
|
||||
request.addBindValue(value);
|
||||
request.addBindValue(value());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -115,7 +126,7 @@ public class SimpleExpression extends AbstractExpression {
|
||||
|
||||
@Override
|
||||
public int queryBindHash() {
|
||||
return value.hashCode();
|
||||
return value().hashCode();
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -132,6 +143,6 @@ public class SimpleExpression extends AbstractExpression {
|
||||
@Override
|
||||
public boolean isSameByBind(SpiExpression other) {
|
||||
SimpleExpression that = (SimpleExpression) other;
|
||||
return value.equals(that.value);
|
||||
return value().equals(that.value());
|
||||
}
|
||||
}
|
||||
Reference in new issue
Block a user