mirror of
https://github.com/ebean-orm/ebean.git
synced 2026-11-17 22:56:28 +00:00
new comparison method Ine (caseInsensitive notEquals) (#1551)
This commit is contained in:
1 parent
7be4675d3e
commit
4fe2016891
22 files changed
+1487
-1008
No files matched your search
+19
-5
@@ -8,8 +8,11 @@ import java.io.IOException;
|
||||
|
||||
class CaseInsensitiveEqualExpression extends AbstractValueExpression {
|
||||
|
||||
CaseInsensitiveEqualExpression(String propertyName, Object value) {
|
||||
private boolean not;
|
||||
|
||||
CaseInsensitiveEqualExpression(String propertyName, Object value, boolean not) {
|
||||
super(propertyName, value);
|
||||
this.not = not;
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -21,7 +24,11 @@ class CaseInsensitiveEqualExpression extends AbstractValueExpression {
|
||||
|
||||
@Override
|
||||
public void writeDocQuery(DocQueryContext context) throws IOException {
|
||||
context.writeIEqualTo(propName, val());
|
||||
if (not) {
|
||||
context.writeINotEqualTo(propName, val());
|
||||
} else {
|
||||
context.writeIEqualTo(propName, val());
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -45,13 +52,20 @@ class CaseInsensitiveEqualExpression extends AbstractValueExpression {
|
||||
if (prop != null && prop.isDbEncrypted()) {
|
||||
pname = prop.getBeanProperty().getDecryptProperty(propName);
|
||||
}
|
||||
|
||||
request.append("lower(").append(pname).append(") =? ");
|
||||
if (not) {
|
||||
request.append("lower(").append(pname).append(") !=? ");
|
||||
} else {
|
||||
request.append("lower(").append(pname).append(") =? ");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void queryPlanHash(StringBuilder builder) {
|
||||
builder.append("Ieq[").append(propName).append("]");
|
||||
if (not) {
|
||||
builder.append("Ine[").append(propName).append("]");
|
||||
} else {
|
||||
builder.append("Ieq[").append(propName).append("]");
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
|
||||
@@ -182,7 +182,19 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
|
||||
if (value == null) {
|
||||
return equalsWithNullAsNoop ? NoopExpression.INSTANCE : isNull(propertyName);
|
||||
}
|
||||
return new CaseInsensitiveEqualExpression(propertyName, value);
|
||||
return new CaseInsensitiveEqualExpression(propertyName, value, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Case Insensitive Equal To - property equal to the given value (typically
|
||||
* using a lower() function to make it case insensitive).
|
||||
*/
|
||||
@Override
|
||||
public Expression ine(String propertyName, String value) {
|
||||
if (value == null) {
|
||||
return equalsWithNullAsNoop ? NoopExpression.INSTANCE : isNotNull(propertyName);
|
||||
}
|
||||
return new CaseInsensitiveEqualExpression(propertyName, value, true);
|
||||
}
|
||||
|
||||
/**
|
||||
@@ -190,7 +202,15 @@ public class DefaultExpressionFactory implements SpiExpressionFactory {
|
||||
*/
|
||||
@Override
|
||||
public Expression ieqObject(String propertyName, Object value) {
|
||||
return new CaseInsensitiveEqualExpression(propertyName, value);
|
||||
return new CaseInsensitiveEqualExpression(propertyName, value, false);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create for named parameter use (and without support for equalsWithNullAsNoop).
|
||||
*/
|
||||
@Override
|
||||
public Expression ineObject(String propertyName, Object value) {
|
||||
return new CaseInsensitiveEqualExpression(propertyName, value, true);
|
||||
}
|
||||
|
||||
/**
|
||||
|
||||
@@ -759,6 +759,12 @@ public class DefaultExpressionList<T> implements SpiExpressionList<T> {
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ExpressionList<T> ine(String propertyName, String value) {
|
||||
add(expr.ine(propertyName, value));
|
||||
return this;
|
||||
}
|
||||
|
||||
@Override
|
||||
public ExpressionList<T> ne(String propertyName, Object value) {
|
||||
add(expr.ne(propertyName, value));
|
||||
|
||||
@@ -48,6 +48,13 @@ public interface DocQueryContext {
|
||||
*/
|
||||
void writeIEqualTo(String propName, String value) throws IOException;
|
||||
|
||||
/**
|
||||
* Write a case insensitive notEqualTo expression.
|
||||
*/
|
||||
default void writeINotEqualTo(String propName, String value) throws IOException {
|
||||
throw new AbstractMethodError("writeINotEqualTo not implemented");
|
||||
}
|
||||
|
||||
/**
|
||||
* Write a range operation with one value.
|
||||
*/
|
||||
|
||||
@@ -616,6 +616,11 @@ class JunctionExpression<T> implements SpiJunction<T>, SpiExpression, Expression
|
||||
return exprList.ieq(propertyName, value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ExpressionList<T> ine(String propertyName, String value) {
|
||||
return exprList.ine(propertyName, value);
|
||||
}
|
||||
|
||||
@Override
|
||||
public ExpressionList<T> iexampleLike(Object example) {
|
||||
return exprList.iexampleLike(example);
|
||||
|
||||
Reference in new issue
Block a user