admin/mybatis-flex
1
0
Fork 0
mirror of https://gitee.com/mybatis-flex/mybatis-flex.git synced 2025-12-07 00:58:24 +08:00
Code Issues Packages Projects Releases Wiki Activity

refactor: 重构 QueryWrapper 使之优先使用用户设置的条件

Browse Source
This commit is contained in:
Michael Yang 2024-10-28 10:27:39 +08:00
parent a440b89a20
commit b4387d65c1
3 changed files with 300 additions and 245 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

301
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryColumn.java
View File

@ -137,13 +137,16 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
// query methods /////// // query methods ///////
QueryCondition eq_(Object value) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, value));
}
@Override @Override
public QueryCondition eq(Object value) { public QueryCondition eq(Object value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) { if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, value)); return eq_(value);
} }
@Override @Override
@ -151,7 +154,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, value)); return eq(value);
} }
@Override @Override
@ -164,12 +167,17 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return eq(value, isEffective.test(value)); return eq(value, isEffective.test(value));
} }
QueryCondition ne_(Object value) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, value));
}
@Override @Override
public QueryCondition ne(Object value) { public QueryCondition ne(Object value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) { if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, value)); return ne_(value);
} }
@Override @Override
@ -177,7 +185,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, value)); return ne_(value);
} }
@Override @Override
@ -190,12 +198,17 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return ne(value, isEffective.test(value)); return ne(value, isEffective.test(value));
} }
QueryCondition gt_(Object value) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.GT, value));
}
@Override @Override
public QueryCondition gt(Object value) { public QueryCondition gt(Object value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) { if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.GT, value)); return gt_(value);
} }
@Override @Override
@ -203,7 +216,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.GT, value)); return gt_(value);
} }
@Override @Override
@ -216,12 +229,17 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return gt(value, isEffective.test(value)); return gt(value, isEffective.test(value));
} }
QueryCondition ge_(Object value) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.GE, value));
}
@Override @Override
public QueryCondition ge(Object value) { public QueryCondition ge(Object value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) { if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.GE, value)); return ge_(value);
} }
@Override @Override
@ -229,7 +247,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.GE, value)); return ge_(value);
} }
@Override @Override
@ -242,12 +260,17 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return gt(value, isEffective.test(value)); return gt(value, isEffective.test(value));
} }
QueryCondition lt_(Object value) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LT, value));
}
@Override @Override
public QueryCondition lt(Object value) { public QueryCondition lt(Object value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) { if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LT, value)); return lt_(value);
} }
@Override @Override
@ -255,7 +278,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LT, value)); return lt_(value);
} }
@Override @Override
@ -268,12 +291,17 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return lt(value, isEffective.test(value)); return lt(value, isEffective.test(value));
} }
QueryCondition le_(Object value) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LE, value));
}
@Override @Override
public QueryCondition le(Object value) { public QueryCondition le(Object value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) { if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LE, value)); return le_(value);
} }
@Override @Override
@ -281,7 +309,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LE, value)); return le_(value);
} }
@Override @Override
@ -294,11 +322,8 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return le(value, isEffective.test(value)); return le(value, isEffective.test(value));
} }
@Override
public QueryCondition in(Object... value) { QueryCondition in_(Object... value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty();
}
// IN 里面只有一个值的情况 // IN 里面只有一个值的情况
if (value.length == 1) { if (value.length == 1) {
if (QueryColumnBehavior.isSmartConvertInToEquals()) { if (QueryColumnBehavior.isSmartConvertInToEquals()) {
@ -306,7 +331,15 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
} }
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, value)); return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, value));
}
@Override
public QueryCondition in(Object... value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty();
}
return in_(value);
} }
@Override @Override
@ -314,13 +347,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
// IN 里面只有一个值的情况 return in_(value);
if (value.length == 1) {
if (QueryColumnBehavior.isSmartConvertInToEquals()) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, value[0]));
}
}
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, value));
} }
@Override @Override
@ -333,22 +360,16 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return in(value, isEffective.test(value)); return in(value, isEffective.test(value));
} }
QueryCondition in_(Collection<?> value) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, value));
}
@Override @Override
public QueryCondition in(Collection<?> value) { public QueryCondition in(Collection<?> value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) { if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
// IN 里面只有一个值的情况 return in_(value);
if (value.size() == 1) {
Object next = value.iterator().next();
if (QueryColumnBehavior.shouldIgnoreValue(next)) {
return QueryCondition.createEmpty();
}
if (QueryColumnBehavior.isSmartConvertInToEquals()) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, next));
}
}
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, value));
} }
@Override @Override
@ -356,17 +377,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
// IN 里面只有一个值的情况 return in_(value);
if (value.size() == 1) {
Object next = value.iterator().next();
if (QueryColumnBehavior.shouldIgnoreValue(next)) {
return QueryCondition.createEmpty();
}
if (QueryColumnBehavior.isSmartConvertInToEquals()) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.EQUALS, next));
}
}
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, value));
} }
@Override @Override
@ -379,12 +390,16 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return in(value, isEffective.test(value)); return in(value, isEffective.test(value));
} }
QueryCondition in_(QueryWrapper queryWrapper) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, queryWrapper));
}
@Override @Override
public QueryCondition in(QueryWrapper queryWrapper) { public QueryCondition in(QueryWrapper queryWrapper) {
if (QueryColumnBehavior.shouldIgnoreValue(queryWrapper)) { if (QueryColumnBehavior.shouldIgnoreValue(queryWrapper)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, queryWrapper)); return in_(queryWrapper);
} }
@Override @Override
@ -392,7 +407,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.IN, queryWrapper)); return in_(queryWrapper);
} }
@Override @Override
@ -400,11 +415,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return in(queryWrapper, isEffective.getAsBoolean()); return in(queryWrapper, isEffective.getAsBoolean());
} }
@Override QueryCondition notIn_(Object... value) {
public QueryCondition notIn(Object... value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty();
}
// NOT IN 里面只有一个值的情况 // NOT IN 里面只有一个值的情况
if (value.length == 1 && QueryColumnBehavior.isSmartConvertInToEquals()) { if (value.length == 1 && QueryColumnBehavior.isSmartConvertInToEquals()) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, value[0])); return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, value[0]));
@ -412,16 +423,20 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, value)); return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, value));
} }
@Override
public QueryCondition notIn(Object... value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty();
}
return notIn_(value);
}
@Override @Override
public QueryCondition notIn(Object[] value, boolean isEffective) { public QueryCondition notIn(Object[] value, boolean isEffective) {
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
// NOT IN 里面只有一个值的情况 return notIn_(value);
if (value.length == 1 && QueryColumnBehavior.isSmartConvertInToEquals()) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, value[0]));
}
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, value));
} }
@Override @Override
@ -434,11 +449,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return notIn(value, isEffective.test(value)); return notIn(value, isEffective.test(value));
} }
@Override QueryCondition notIn_(Collection<?> value) {
public QueryCondition notIn(Collection<?> value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty();
}
// NOT IN 里面只有一个值的情况 // NOT IN 里面只有一个值的情况
if (value.size() == 1 && QueryColumnBehavior.isSmartConvertInToEquals()) { if (value.size() == 1 && QueryColumnBehavior.isSmartConvertInToEquals()) {
Object next = value.iterator().next(); Object next = value.iterator().next();
@ -447,18 +458,20 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, value)); return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, value));
} }
@Override
public QueryCondition notIn(Collection<?> value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty();
}
return notIn_(value);
}
@Override @Override
public QueryCondition notIn(Collection<?> value, boolean isEffective) { public QueryCondition notIn(Collection<?> value, boolean isEffective) {
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
// NOT IN 里面只有一个值的情况 return notIn_(value);
// NOT IN 里面只有一个值的情况
if (value.size() == 1 && QueryColumnBehavior.isSmartConvertInToEquals()) {
Object next = value.iterator().next();
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_EQUALS, next));
}
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, value));
} }
@Override @Override
@ -471,12 +484,16 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return notIn(value, isEffective.test(value)); return notIn(value, isEffective.test(value));
} }
QueryCondition notIn_(QueryWrapper queryWrapper) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, queryWrapper));
}
@Override @Override
public QueryCondition notIn(QueryWrapper queryWrapper) { public QueryCondition notIn(QueryWrapper queryWrapper) {
if (QueryColumnBehavior.shouldIgnoreValue(queryWrapper)) { if (QueryColumnBehavior.shouldIgnoreValue(queryWrapper)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, queryWrapper)); return notIn_(queryWrapper);
} }
@Override @Override
@ -484,7 +501,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_IN, queryWrapper)); return notIn_(queryWrapper);
} }
@Override @Override
@ -492,17 +509,23 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return notIn(queryWrapper, isEffective.getAsBoolean()); return notIn(queryWrapper, isEffective.getAsBoolean());
} }
QueryCondition between_(Object[] values) {
if (values == null || values.length != 2) {
throw new IllegalArgumentException("values is null or length is not 2");
}
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.BETWEEN, values));
}
QueryCondition between_(Object start, Object end) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.BETWEEN, new Object[]{start, end}));
}
@Override @Override
public QueryCondition between(Object[] values) { public QueryCondition between(Object[] values) {
if (QueryColumnBehavior.shouldIgnoreValue(values)) { if (QueryColumnBehavior.shouldIgnoreValue(values)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return between_(values);
if (values == null || values.length != 2) {
throw new IllegalArgumentException("values is null or length is not 2");
}
return between(values[0], values[values.length - 1]);
} }
@Override @Override
@ -510,12 +533,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return between_(values);
if (values == null || values.length != 2) {
throw new IllegalArgumentException("values is null or length is not 2");
}
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.BETWEEN, values));
} }
@Override @Override
@ -523,7 +541,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) { if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.BETWEEN, new Object[]{start, end})); return between_(new Object[]{start, end});
} }
@Override @Override
@ -531,7 +549,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.BETWEEN, new Object[]{start, end})); return between_(new Object[]{start, end});
} }
@Override @Override
@ -544,25 +562,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return between(start, end, isEffective.test(start, end)); return between(start, end, isEffective.test(start, end));
} }
@Override QueryCondition notBetween_(Object[] values) {
public QueryCondition notBetween(Object[] values) {
if (QueryColumnBehavior.shouldIgnoreValue(values)) {
return QueryCondition.createEmpty();
}
if (values == null || values.length != 2) {
throw new IllegalArgumentException("values is null or length is not 2");
}
return notBetween(values[0], values[values.length - 1]);
}
@Override
public QueryCondition notBetween(Object[] values, boolean isEffective) {
if (!isEffective) {
return QueryCondition.createEmpty();
}
if (values == null || values.length != 2) { if (values == null || values.length != 2) {
throw new IllegalArgumentException("values is null or length is not 2"); throw new IllegalArgumentException("values is null or length is not 2");
} }
@ -570,12 +570,32 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_BETWEEN, values)); return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_BETWEEN, values));
} }
QueryCondition notBetween_(Object start, Object end) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_BETWEEN, new Object[]{start, end}));
}
@Override
public QueryCondition notBetween(Object[] values) {
if (QueryColumnBehavior.shouldIgnoreValue(values)) {
return QueryCondition.createEmpty();
}
return notBetween_(values);
}
@Override
public QueryCondition notBetween(Object[] values, boolean isEffective) {
if (!isEffective) {
return QueryCondition.createEmpty();
}
return notBetween_(values);
}
@Override @Override
public QueryCondition notBetween(Object start, Object end) { public QueryCondition notBetween(Object start, Object end) {
if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) { if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_BETWEEN, new Object[]{start, end})); return notBetween_(new Object[]{start, end});
} }
@Override @Override
@ -583,7 +603,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlConsts.NOT_BETWEEN, new Object[]{start, end})); return notBetween_(new Object[]{start, end});
} }
@Override @Override
@ -596,12 +616,16 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return notBetween(start, end, isEffective.test(start, end)); return notBetween(start, end, isEffective.test(start, end));
} }
QueryCondition like_(Object value) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, "%" + value + "%"));
}
@Override @Override
public QueryCondition like(Object value) { public QueryCondition like(Object value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) { if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, "%" + value + "%")); return like_(value);
} }
@Override @Override
@ -609,7 +633,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, "%" + value + "%")); return like_(value);
} }
@Override @Override
@ -622,12 +646,16 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return like(value, isEffective.test(value)); return like(value, isEffective.test(value));
} }
QueryCondition likeLeft_(Object value) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, value + "%"));
}
@Override @Override
public QueryCondition likeLeft(Object value) { public QueryCondition likeLeft(Object value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) { if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, value + "%")); return likeLeft_(value);
} }
@Override @Override
@ -635,7 +663,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, value + "%")); return likeLeft_(value);
} }
@Override @Override
@ -648,12 +676,16 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return likeLeft(value, isEffective.test(value)); return likeLeft(value, isEffective.test(value));
} }
QueryCondition likeRight_(Object value) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, "%" + value));
}
@Override @Override
public QueryCondition likeRight(Object value) { public QueryCondition likeRight(Object value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) { if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, "%" + value)); return likeRight_(value);
} }
@Override @Override
@ -661,7 +693,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, "%" + value)); return likeRight_(value);
} }
@Override @Override
@ -674,6 +706,12 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return likeRight(value, isEffective.test(value)); return likeRight(value, isEffective.test(value));
} }
QueryCondition likeRaw_(Object value) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, value));
}
/** /**
* {@code LIKE value} * {@code LIKE value}
*/ */
@ -681,7 +719,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (QueryColumnBehavior.shouldIgnoreValue(value)) { if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return likeRaw(value, true); return likeRaw_(value);
} }
/** /**
@ -691,7 +729,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.LIKE, value)); return likeRaw_(value);
} }
/** /**
@ -708,12 +746,16 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return likeRaw(value, isEffective.test(value)); return likeRaw(value, isEffective.test(value));
} }
QueryCondition notLike_(Object value) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, "%" + value + "%"));
}
@Override @Override
public QueryCondition notLike(Object value) { public QueryCondition notLike(Object value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) { if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, "%" + value + "%")); return notLike_(value);
} }
@Override @Override
@ -721,7 +763,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, "%" + value + "%")); return notLike_(value);
} }
@Override @Override
@ -734,12 +776,16 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return notLike(value, isEffective.test(value)); return notLike(value, isEffective.test(value));
} }
QueryCondition notLikeLeft_(Object value) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, value + "%"));
}
@Override @Override
public QueryCondition notLikeLeft(Object value) { public QueryCondition notLikeLeft(Object value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) { if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, value + "%")); return notLikeLeft_(value);
} }
@Override @Override
@ -747,7 +793,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, value + "%")); return notLikeLeft_(value);
} }
@Override @Override
@ -760,12 +806,16 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return notLikeLeft(value, isEffective.test(value)); return notLikeLeft(value, isEffective.test(value));
} }
QueryCondition notLikeRight_(Object value) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, "%" + value));
}
@Override @Override
public QueryCondition notLikeRight(Object value) { public QueryCondition notLikeRight(Object value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) { if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, "%" + value)); return notLikeRight_(value);
} }
@Override @Override
@ -773,7 +823,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, "%" + value)); return notLikeRight_(value);
} }
@Override @Override
@ -786,6 +836,11 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
return notLikeRight(value, isEffective.test(value)); return notLikeRight(value, isEffective.test(value));
} }
QueryCondition notLikeRaw_(Object value) {
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, value));
}
/** /**
* {@code NOT LIKE value} * {@code NOT LIKE value}
*/ */
@ -793,7 +848,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (QueryColumnBehavior.shouldIgnoreValue(value)) { if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return likeRaw(value, true); return notLikeRaw_(value);
} }
/** /**
@ -803,7 +858,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
if (!isEffective) { if (!isEffective) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return QueryColumnBehavior.castCondition(QueryCondition.create(this, SqlOperator.NOT_LIKE, value)); return notLikeRaw_(value);
} }
/** /**

144
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapper.java
View File

@ -889,7 +889,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper eq(String column, Object value, boolean isEffective) { public QueryWrapper eq(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).eq(value)); and(QueryMethods.column(column).eq_(value));
} }
return this; return this;
} }
@ -903,7 +903,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper eq(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> QueryWrapper eq(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).eq(value)); and(QueryMethods.column(column).eq_(value));
} }
return this; return this;
} }
@ -917,7 +917,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <V> QueryWrapper eq(String column, V value, Predicate<V> isEffective) { public <V> QueryWrapper eq(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).eq(value)); and(QueryMethods.column(column).eq_(value));
} }
return this; return this;
} }
@ -931,7 +931,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T, V> QueryWrapper eq(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> QueryWrapper eq(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).eq(value)); and(QueryMethods.column(column).eq_(value));
} }
return this; return this;
} }
@ -968,7 +968,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper ne(String column, Object value, boolean isEffective) { public QueryWrapper ne(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).ne(value)); and(QueryMethods.column(column).ne_(value));
} }
return this; return this;
} }
@ -982,7 +982,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper ne(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> QueryWrapper ne(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).ne(value)); and(QueryMethods.column(column).ne_(value));
} }
return this; return this;
} }
@ -996,7 +996,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <V> QueryWrapper ne(String column, V value, Predicate<V> isEffective) { public <V> QueryWrapper ne(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).ne(value)); and(QueryMethods.column(column).ne_(value));
} }
return this; return this;
} }
@ -1010,7 +1010,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T, V> QueryWrapper ne(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> QueryWrapper ne(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).ne(value)); and(QueryMethods.column(column).ne_(value));
} }
return this; return this;
} }
@ -1047,7 +1047,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper gt(String column, Object value, boolean isEffective) { public QueryWrapper gt(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).gt(value)); and(QueryMethods.column(column).gt_(value));
} }
return this; return this;
} }
@ -1061,7 +1061,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper gt(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> QueryWrapper gt(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).gt(value)); and(QueryMethods.column(column).gt_(value));
} }
return this; return this;
} }
@ -1075,7 +1075,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <V> QueryWrapper gt(String column, V value, Predicate<V> isEffective) { public <V> QueryWrapper gt(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).gt(value)); and(QueryMethods.column(column).gt_(value));
} }
return this; return this;
} }
@ -1089,7 +1089,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T, V> QueryWrapper gt(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> QueryWrapper gt(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).gt(value)); and(QueryMethods.column(column).gt_(value));
} }
return this; return this;
} }
@ -1126,7 +1126,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper ge(String column, Object value, boolean isEffective) { public QueryWrapper ge(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).ge(value)); and(QueryMethods.column(column).ge_(value));
} }
return this; return this;
} }
@ -1140,7 +1140,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper ge(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> QueryWrapper ge(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).ge(value)); and(QueryMethods.column(column).ge_(value));
} }
return this; return this;
} }
@ -1154,7 +1154,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <V> QueryWrapper ge(String column, V value, Predicate<V> isEffective) { public <V> QueryWrapper ge(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).ge(value)); and(QueryMethods.column(column).ge_(value));
} }
return this; return this;
} }
@ -1168,7 +1168,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T, V> QueryWrapper ge(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> QueryWrapper ge(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).ge(value)); and(QueryMethods.column(column).ge_(value));
} }
return this; return this;
} }
@ -1205,7 +1205,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper lt(String column, Object value, boolean isEffective) { public QueryWrapper lt(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).lt(value)); and(QueryMethods.column(column).lt_(value));
} }
return this; return this;
} }
@ -1219,7 +1219,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper lt(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> QueryWrapper lt(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).lt(value)); and(QueryMethods.column(column).lt_(value));
} }
return this; return this;
} }
@ -1233,7 +1233,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <V> QueryWrapper lt(String column, V value, Predicate<V> isEffective) { public <V> QueryWrapper lt(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).lt(value)); and(QueryMethods.column(column).lt_(value));
} }
return this; return this;
} }
@ -1247,7 +1247,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T, V> QueryWrapper lt(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> QueryWrapper lt(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).lt(value)); and(QueryMethods.column(column).lt_(value));
} }
return this; return this;
} }
@ -1284,7 +1284,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper le(String column, Object value, boolean isEffective) { public QueryWrapper le(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).le(value)); and(QueryMethods.column(column).le_(value));
} }
return this; return this;
} }
@ -1298,7 +1298,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper le(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> QueryWrapper le(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).le(value)); and(QueryMethods.column(column).le_(value));
} }
return this; return this;
} }
@ -1312,7 +1312,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <V> QueryWrapper le(String column, V value, Predicate<V> isEffective) { public <V> QueryWrapper le(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).le(value)); and(QueryMethods.column(column).le_(value));
} }
return this; return this;
} }
@ -1326,7 +1326,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T, V> QueryWrapper le(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> QueryWrapper le(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).le(value)); and(QueryMethods.column(column).le_(value));
} }
return this; return this;
} }
@ -1410,7 +1410,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper in(String column, Object[] values, boolean isEffective) { public QueryWrapper in(String column, Object[] values, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).in(values)); and(QueryMethods.column(column).in_(values));
} }
return this; return this;
} }
@ -1423,7 +1423,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper in(LambdaGetter<T> column, Object[] values, boolean isEffective) { public <T> QueryWrapper in(LambdaGetter<T> column, Object[] values, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).in(values)); and(QueryMethods.column(column).in_(values));
} }
return this; return this;
} }
@ -1437,7 +1437,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper in(String column, Collection<?> values, boolean isEffective) { public QueryWrapper in(String column, Collection<?> values, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).in(values)); and(QueryMethods.column(column).in_(values));
} }
return this; return this;
} }
@ -1450,7 +1450,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper in(LambdaGetter<T> column, Collection<?> values, boolean isEffective) { public <T> QueryWrapper in(LambdaGetter<T> column, Collection<?> values, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).in(values)); and(QueryMethods.column(column).in_(values));
} }
return this; return this;
} }
@ -1464,7 +1464,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper in(String column, QueryWrapper queryWrapper, boolean isEffective) { public QueryWrapper in(String column, QueryWrapper queryWrapper, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).in(queryWrapper)); and(QueryMethods.column(column).in_(queryWrapper));
} }
return this; return this;
} }
@ -1478,7 +1478,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper in(LambdaGetter<T> column, QueryWrapper queryWrapper, boolean isEffective) { public <T> QueryWrapper in(LambdaGetter<T> column, QueryWrapper queryWrapper, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).in(queryWrapper)); and(QueryMethods.column(column).in_(queryWrapper));
} }
return this; return this;
} }
@ -1492,7 +1492,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper in(String column, QueryWrapper queryWrapper, BooleanSupplier isEffective) { public QueryWrapper in(String column, QueryWrapper queryWrapper, BooleanSupplier isEffective) {
if (isEffective.getAsBoolean()) { if (isEffective.getAsBoolean()) {
and(QueryMethods.column(column).in(queryWrapper)); and(QueryMethods.column(column).in_(queryWrapper));
} }
return this; return this;
} }
@ -1506,7 +1506,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper in(LambdaGetter<T> column, QueryWrapper queryWrapper, BooleanSupplier isEffective) { public <T> QueryWrapper in(LambdaGetter<T> column, QueryWrapper queryWrapper, BooleanSupplier isEffective) {
if (isEffective.getAsBoolean()) { if (isEffective.getAsBoolean()) {
and(QueryMethods.column(column).in(queryWrapper)); and(QueryMethods.column(column).in_(queryWrapper));
} }
return this; return this;
} }
@ -1590,7 +1590,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper notIn(String column, Object[] values, boolean isEffective) { public QueryWrapper notIn(String column, Object[] values, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notIn(values)); and(QueryMethods.column(column).notIn_(values));
} }
return this; return this;
} }
@ -1603,7 +1603,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper notIn(LambdaGetter<T> column, Object[] values, boolean isEffective) { public <T> QueryWrapper notIn(LambdaGetter<T> column, Object[] values, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notIn(values)); and(QueryMethods.column(column).notIn_(values));
} }
return this; return this;
} }
@ -1617,7 +1617,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper notIn(String column, Collection<?> values, boolean isEffective) { public QueryWrapper notIn(String column, Collection<?> values, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notIn(values)); and(QueryMethods.column(column).notIn_(values));
} }
return this; return this;
} }
@ -1630,7 +1630,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper notIn(LambdaGetter<T> column, Collection<?> values, boolean isEffective) { public <T> QueryWrapper notIn(LambdaGetter<T> column, Collection<?> values, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notIn(values)); and(QueryMethods.column(column).notIn_(values));
} }
return this; return this;
} }
@ -1644,7 +1644,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper notIn(String column, QueryWrapper queryWrapper, boolean isEffective) { public QueryWrapper notIn(String column, QueryWrapper queryWrapper, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notIn(queryWrapper)); and(QueryMethods.column(column).notIn_(queryWrapper));
} }
return this; return this;
} }
@ -1658,7 +1658,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper notIn(LambdaGetter<T> column, QueryWrapper queryWrapper, boolean isEffective) { public <T> QueryWrapper notIn(LambdaGetter<T> column, QueryWrapper queryWrapper, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notIn(queryWrapper)); and(QueryMethods.column(column).notIn_(queryWrapper));
} }
return this; return this;
} }
@ -1672,7 +1672,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper notIn(String column, QueryWrapper queryWrapper, BooleanSupplier isEffective) { public QueryWrapper notIn(String column, QueryWrapper queryWrapper, BooleanSupplier isEffective) {
if (isEffective.getAsBoolean()) { if (isEffective.getAsBoolean()) {
and(QueryMethods.column(column).notIn(queryWrapper)); and(QueryMethods.column(column).notIn_(queryWrapper));
} }
return this; return this;
} }
@ -1686,7 +1686,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper notIn(LambdaGetter<T> column, QueryWrapper queryWrapper, BooleanSupplier isEffective) { public <T> QueryWrapper notIn(LambdaGetter<T> column, QueryWrapper queryWrapper, BooleanSupplier isEffective) {
if (isEffective.getAsBoolean()) { if (isEffective.getAsBoolean()) {
and(QueryMethods.column(column).notIn(queryWrapper)); and(QueryMethods.column(column).notIn_(queryWrapper));
} }
return this; return this;
} }
@ -1725,7 +1725,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper between(String column, Object start, Object end, boolean isEffective) { public QueryWrapper between(String column, Object start, Object end, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).between(start, end)); and(QueryMethods.column(column).between_(start, end));
} }
return this; return this;
} }
@ -1739,7 +1739,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper between(LambdaGetter<T> column, Object start, Object end, boolean isEffective) { public <T> QueryWrapper between(LambdaGetter<T> column, Object start, Object end, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).between(start, end)); and(QueryMethods.column(column).between_(start, end));
} }
return this; return this;
} }
@ -1754,7 +1754,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper between(String column, Object start, Object end, BooleanSupplier isEffective) { public QueryWrapper between(String column, Object start, Object end, BooleanSupplier isEffective) {
if (isEffective.getAsBoolean()) { if (isEffective.getAsBoolean()) {
and(QueryMethods.column(column).between(start, end)); and(QueryMethods.column(column).between_(start, end));
} }
return this; return this;
} }
@ -1768,7 +1768,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper between(LambdaGetter<T> column, Object start, Object end, BooleanSupplier isEffective) { public <T> QueryWrapper between(LambdaGetter<T> column, Object start, Object end, BooleanSupplier isEffective) {
if (isEffective.getAsBoolean()) { if (isEffective.getAsBoolean()) {
and(QueryMethods.column(column).between(start, end)); and(QueryMethods.column(column).between_(start, end));
} }
return this; return this;
} }
@ -1807,7 +1807,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper notBetween(String column, Object start, Object end, boolean isEffective) { public QueryWrapper notBetween(String column, Object start, Object end, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notBetween(start, end)); and(QueryMethods.column(column).notBetween_(start, end));
} }
return this; return this;
} }
@ -1821,7 +1821,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper notBetween(LambdaGetter<T> column, Object start, Object end, boolean isEffective) { public <T> QueryWrapper notBetween(LambdaGetter<T> column, Object start, Object end, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notBetween(start, end)); and(QueryMethods.column(column).notBetween_(start, end));
} }
return this; return this;
} }
@ -1836,7 +1836,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper notBetween(String column, Object start, Object end, BooleanSupplier isEffective) { public QueryWrapper notBetween(String column, Object start, Object end, BooleanSupplier isEffective) {
if (isEffective.getAsBoolean()) { if (isEffective.getAsBoolean()) {
and(QueryMethods.column(column).notBetween(start, end)); and(QueryMethods.column(column).notBetween_(start, end));
} }
return this; return this;
} }
@ -1850,7 +1850,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper notBetween(LambdaGetter<T> column, Object start, Object end, BooleanSupplier isEffective) { public <T> QueryWrapper notBetween(LambdaGetter<T> column, Object start, Object end, BooleanSupplier isEffective) {
if (isEffective.getAsBoolean()) { if (isEffective.getAsBoolean()) {
and(QueryMethods.column(column).notBetween(start, end)); and(QueryMethods.column(column).notBetween_(start, end));
} }
return this; return this;
} }
@ -1887,7 +1887,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper like(String column, Object value, boolean isEffective) { public QueryWrapper like(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).like(value)); and(QueryMethods.column(column).like_(value));
} }
return this; return this;
} }
@ -1901,7 +1901,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper like(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> QueryWrapper like(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).like(value)); and(QueryMethods.column(column).like_(value));
} }
return this; return this;
} }
@ -1915,7 +1915,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <V> QueryWrapper like(String column, V value, Predicate<V> isEffective) { public <V> QueryWrapper like(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).like(value)); and(QueryMethods.column(column).like_(value));
} }
return this; return this;
} }
@ -1929,7 +1929,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T, V> QueryWrapper like(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> QueryWrapper like(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).like(value)); and(QueryMethods.column(column).like_(value));
} }
return this; return this;
} }
@ -1966,7 +1966,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper likeLeft(String column, Object value, boolean isEffective) { public QueryWrapper likeLeft(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).likeLeft(value)); and(QueryMethods.column(column).likeLeft_(value));
} }
return this; return this;
} }
@ -1980,7 +1980,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper likeLeft(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> QueryWrapper likeLeft(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).likeLeft(value)); and(QueryMethods.column(column).likeLeft_(value));
} }
return this; return this;
} }
@ -1994,7 +1994,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <V> QueryWrapper likeLeft(String column, V value, Predicate<V> isEffective) { public <V> QueryWrapper likeLeft(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).likeLeft(value)); and(QueryMethods.column(column).likeLeft_(value));
} }
return this; return this;
} }
@ -2008,7 +2008,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T, V> QueryWrapper likeLeft(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> QueryWrapper likeLeft(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).likeLeft(value)); and(QueryMethods.column(column).likeLeft_(value));
} }
return this; return this;
} }
@ -2045,7 +2045,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper likeRight(String column, Object value, boolean isEffective) { public QueryWrapper likeRight(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).likeRight(value)); and(QueryMethods.column(column).likeRight_(value));
} }
return this; return this;
} }
@ -2059,7 +2059,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper likeRight(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> QueryWrapper likeRight(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).likeRight(value)); and(QueryMethods.column(column).likeRight_(value));
} }
return this; return this;
} }
@ -2073,7 +2073,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <V> QueryWrapper likeRight(String column, V value, Predicate<V> isEffective) { public <V> QueryWrapper likeRight(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).likeRight(value)); and(QueryMethods.column(column).likeRight_(value));
} }
return this; return this;
} }
@ -2087,7 +2087,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T, V> QueryWrapper likeRight(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> QueryWrapper likeRight(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).likeRight(value)); and(QueryMethods.column(column).likeRight_(value));
} }
return this; return this;
} }
@ -2124,7 +2124,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper notLike(String column, Object value, boolean isEffective) { public QueryWrapper notLike(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notLike(value)); and(QueryMethods.column(column).notLike_(value));
} }
return this; return this;
} }
@ -2138,7 +2138,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper notLike(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> QueryWrapper notLike(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notLike(value)); and(QueryMethods.column(column).notLike_(value));
} }
return this; return this;
} }
@ -2152,7 +2152,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <V> QueryWrapper notLike(String column, V value, Predicate<V> isEffective) { public <V> QueryWrapper notLike(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).notLike(value)); and(QueryMethods.column(column).notLike_(value));
} }
return this; return this;
} }
@ -2166,7 +2166,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T, V> QueryWrapper notLike(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> QueryWrapper notLike(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).notLike(value)); and(QueryMethods.column(column).notLike_(value));
} }
return this; return this;
} }
@ -2203,7 +2203,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper notLikeLeft(String column, Object value, boolean isEffective) { public QueryWrapper notLikeLeft(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notLikeLeft(value)); and(QueryMethods.column(column).notLikeLeft_(value));
} }
return this; return this;
} }
@ -2217,7 +2217,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper notLikeLeft(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> QueryWrapper notLikeLeft(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notLikeLeft(value)); and(QueryMethods.column(column).notLikeLeft_(value));
} }
return this; return this;
} }
@ -2231,7 +2231,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <V> QueryWrapper notLikeLeft(String column, V value, Predicate<V> isEffective) { public <V> QueryWrapper notLikeLeft(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).notLikeLeft(value)); and(QueryMethods.column(column).notLikeLeft_(value));
} }
return this; return this;
} }
@ -2245,7 +2245,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T, V> QueryWrapper notLikeLeft(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> QueryWrapper notLikeLeft(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).notLikeLeft(value)); and(QueryMethods.column(column).notLikeLeft_(value));
} }
return this; return this;
} }
@ -2282,7 +2282,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public QueryWrapper notLikeRight(String column, Object value, boolean isEffective) { public QueryWrapper notLikeRight(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notLikeRight(value)); and(QueryMethods.column(column).notLikeRight_(value));
} }
return this; return this;
} }
@ -2296,7 +2296,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T> QueryWrapper notLikeRight(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> QueryWrapper notLikeRight(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notLikeRight(value)); and(QueryMethods.column(column).notLikeRight_(value));
} }
return this; return this;
} }
@ -2310,7 +2310,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <V> QueryWrapper notLikeRight(String column, V value, Predicate<V> isEffective) { public <V> QueryWrapper notLikeRight(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).notLikeRight(value)); and(QueryMethods.column(column).notLikeRight_(value));
} }
return this; return this;
} }
@ -2324,7 +2324,7 @@ public class QueryWrapper extends BaseQueryWrapper<QueryWrapper> {
*/ */
public <T, V> QueryWrapper notLikeRight(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> QueryWrapper notLikeRight(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).notLikeRight(value)); and(QueryMethods.column(column).notLikeRight_(value));
} }
return this; return this;
} }

100
mybatis-flex-core/src/main/java/com/mybatisflex/core/query/QueryWrapperAdapter.java
View File

@ -638,7 +638,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public R eq(String column, Object value, boolean isEffective) { public R eq(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).eq(value, true)); and(QueryMethods.column(column).eq_(value));
} }
return (R) this; return (R) this;
} }
@ -653,7 +653,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T> R eq(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> R eq(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).eq(value, true)); and(QueryMethods.column(column).eq_(value));
} }
return (R) this; return (R) this;
} }
@ -668,7 +668,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <V> R eq(String column, V value, Predicate<V> isEffective) { public <V> R eq(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).eq(value, true)); and(QueryMethods.column(column).eq_(value));
} }
return (R) this; return (R) this;
} }
@ -683,7 +683,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T, V> R eq(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> R eq(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).eq(value, true)); and(QueryMethods.column(column).eq_(value));
} }
return (R) this; return (R) this;
} }
@ -723,7 +723,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public R ne(String column, Object value, boolean isEffective) { public R ne(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).ne(value, true)); and(QueryMethods.column(column).ne_(value));
} }
return (R) this; return (R) this;
} }
@ -738,7 +738,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T> R ne(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> R ne(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).ne(value, true)); and(QueryMethods.column(column).ne_(value));
} }
return (R) this; return (R) this;
} }
@ -753,7 +753,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <V> R ne(String column, V value, Predicate<V> isEffective) { public <V> R ne(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).ne(value, true)); and(QueryMethods.column(column).ne_(value));
} }
return (R) this; return (R) this;
} }
@ -768,7 +768,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T, V> R ne(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> R ne(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).ne(value, true)); and(QueryMethods.column(column).ne_(value));
} }
return (R) this; return (R) this;
} }
@ -808,7 +808,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public R gt(String column, Object value, boolean isEffective) { public R gt(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).gt(value, true)); and(QueryMethods.column(column).gt_(value));
} }
return (R) this; return (R) this;
} }
@ -823,7 +823,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T> R gt(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> R gt(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).gt(value, true)); and(QueryMethods.column(column).gt_(value));
} }
return (R) this; return (R) this;
} }
@ -838,7 +838,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <V> R gt(String column, V value, Predicate<V> isEffective) { public <V> R gt(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).gt(value, true)); and(QueryMethods.column(column).gt_(value));
} }
return (R) this; return (R) this;
} }
@ -853,7 +853,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T, V> R gt(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> R gt(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).gt(value, true)); and(QueryMethods.column(column).gt_(value));
} }
return (R) this; return (R) this;
} }
@ -867,7 +867,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
*/ */
@Override @Override
public R ge(String column, Object value) { public R ge(String column, Object value) {
and(QueryMethods.column(column).ge(value, true)); and(QueryMethods.column(column).ge_(value));
return (R) this; return (R) this;
} }
@ -879,7 +879,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
*/ */
@Override @Override
public <T> R ge(LambdaGetter<T> column, Object value) { public <T> R ge(LambdaGetter<T> column, Object value) {
and(QueryMethods.column(column).ge(value, true)); and(QueryMethods.column(column).ge_(value));
return (R) this; return (R) this;
} }
@ -893,7 +893,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public R ge(String column, Object value, boolean isEffective) { public R ge(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).ge(value, true)); and(QueryMethods.column(column).ge_(value));
} }
return (R) this; return (R) this;
} }
@ -908,7 +908,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T> R ge(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> R ge(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).ge(value, true)); and(QueryMethods.column(column).ge_(value));
} }
return (R) this; return (R) this;
} }
@ -923,7 +923,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <V> R ge(String column, V value, Predicate<V> isEffective) { public <V> R ge(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).ge(value, true)); and(QueryMethods.column(column).ge_(value));
} }
return (R) this; return (R) this;
} }
@ -938,7 +938,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T, V> R ge(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> R ge(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).ge(value, true)); and(QueryMethods.column(column).ge_(value));
} }
return (R) this; return (R) this;
} }
@ -978,7 +978,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public R lt(String column, Object value, boolean isEffective) { public R lt(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).lt(value, true)); and(QueryMethods.column(column).lt_(value));
} }
return (R) this; return (R) this;
} }
@ -993,7 +993,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T> R lt(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> R lt(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).lt(value, true)); and(QueryMethods.column(column).lt_(value));
} }
return (R) this; return (R) this;
} }
@ -1008,7 +1008,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <V> R lt(String column, V value, Predicate<V> isEffective) { public <V> R lt(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).lt(value, true)); and(QueryMethods.column(column).lt_(value));
} }
return (R) this; return (R) this;
} }
@ -1023,7 +1023,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T, V> R lt(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> R lt(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).lt(value, true)); and(QueryMethods.column(column).lt_(value));
} }
return (R) this; return (R) this;
} }
@ -1063,7 +1063,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public R le(String column, Object value, boolean isEffective) { public R le(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).le(value, true)); and(QueryMethods.column(column).le_(value));
} }
return (R) this; return (R) this;
} }
@ -1078,7 +1078,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T> R le(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> R le(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).le(value, true)); and(QueryMethods.column(column).le_(value));
} }
return (R) this; return (R) this;
} }
@ -1093,7 +1093,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <V> R le(String column, V value, Predicate<V> isEffective) { public <V> R le(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).le(value, true)); and(QueryMethods.column(column).le_(value));
} }
return (R) this; return (R) this;
} }
@ -1108,7 +1108,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T, V> R le(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> R le(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).le(value, true)); and(QueryMethods.column(column).le_(value));
} }
return (R) this; return (R) this;
} }
@ -1712,7 +1712,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public R like(String column, Object value, boolean isEffective) { public R like(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).like(value, true)); and(QueryMethods.column(column).like_(value));
} }
return (R) this; return (R) this;
} }
@ -1727,7 +1727,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T> R like(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> R like(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).like(value, true)); and(QueryMethods.column(column).like_(value));
} }
return (R) this; return (R) this;
} }
@ -1742,7 +1742,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <V> R like(String column, V value, Predicate<V> isEffective) { public <V> R like(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).like(value, true)); and(QueryMethods.column(column).like_(value));
} }
return (R) this; return (R) this;
} }
@ -1757,7 +1757,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T, V> R like(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> R like(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).like(value, true)); and(QueryMethods.column(column).like_(value));
} }
return (R) this; return (R) this;
} }
@ -1797,7 +1797,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public R likeLeft(String column, Object value, boolean isEffective) { public R likeLeft(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).likeLeft(value, true)); and(QueryMethods.column(column).likeLeft_(value));
} }
return (R) this; return (R) this;
} }
@ -1812,7 +1812,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T> R likeLeft(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> R likeLeft(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).likeLeft(value, true)); and(QueryMethods.column(column).likeLeft_(value));
} }
return (R) this; return (R) this;
} }
@ -1827,7 +1827,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <V> R likeLeft(String column, V value, Predicate<V> isEffective) { public <V> R likeLeft(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).likeLeft(value, true)); and(QueryMethods.column(column).likeLeft_(value));
} }
return (R) this; return (R) this;
} }
@ -1842,7 +1842,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T, V> R likeLeft(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> R likeLeft(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).likeLeft(value, true)); and(QueryMethods.column(column).likeLeft_(value));
} }
return (R) this; return (R) this;
} }
@ -1882,7 +1882,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public R likeRight(String column, Object value, boolean isEffective) { public R likeRight(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).likeRight(value, true)); and(QueryMethods.column(column).likeRight_(value));
} }
return (R) this; return (R) this;
} }
@ -1897,7 +1897,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T> R likeRight(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> R likeRight(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).likeRight(value, true)); and(QueryMethods.column(column).likeRight_(value));
} }
return (R) this; return (R) this;
} }
@ -1912,7 +1912,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <V> R likeRight(String column, V value, Predicate<V> isEffective) { public <V> R likeRight(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).likeRight(value, true)); and(QueryMethods.column(column).likeRight_(value));
} }
return (R) this; return (R) this;
} }
@ -1927,7 +1927,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T, V> R likeRight(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> R likeRight(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).likeRight(value, true)); and(QueryMethods.column(column).likeRight_(value));
} }
return (R) this; return (R) this;
} }
@ -1967,7 +1967,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public R notLike(String column, Object value, boolean isEffective) { public R notLike(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notLike(value, true)); and(QueryMethods.column(column).notLike_(value));
} }
return (R) this; return (R) this;
} }
@ -1982,7 +1982,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T> R notLike(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> R notLike(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notLike(value, true)); and(QueryMethods.column(column).notLike_(value));
} }
return (R) this; return (R) this;
} }
@ -1997,7 +1997,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <V> R notLike(String column, V value, Predicate<V> isEffective) { public <V> R notLike(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).notLike(value, true)); and(QueryMethods.column(column).notLike_(value));
} }
return (R) this; return (R) this;
} }
@ -2012,7 +2012,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T, V> R notLike(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> R notLike(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).notLike(value, true)); and(QueryMethods.column(column).notLike_(value));
} }
return (R) this; return (R) this;
} }
@ -2052,7 +2052,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public R notLikeLeft(String column, Object value, boolean isEffective) { public R notLikeLeft(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notLikeLeft(value, true)); and(QueryMethods.column(column).notLikeLeft_(value));
} }
return (R) this; return (R) this;
} }
@ -2067,7 +2067,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T> R notLikeLeft(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> R notLikeLeft(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notLikeLeft(value, true)); and(QueryMethods.column(column).notLikeLeft_(value));
} }
return (R) this; return (R) this;
} }
@ -2082,7 +2082,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <V> R notLikeLeft(String column, V value, Predicate<V> isEffective) { public <V> R notLikeLeft(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).notLikeLeft(value, true)); and(QueryMethods.column(column).notLikeLeft_(value));
} }
return (R) this; return (R) this;
} }
@ -2097,7 +2097,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T, V> R notLikeLeft(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> R notLikeLeft(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).notLikeLeft(value, true)); and(QueryMethods.column(column).notLikeLeft_(value));
} }
return (R) this; return (R) this;
} }
@ -2137,7 +2137,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public R notLikeRight(String column, Object value, boolean isEffective) { public R notLikeRight(String column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notLikeRight(value, true)); and(QueryMethods.column(column).notLikeRight_(value));
} }
return (R) this; return (R) this;
} }
@ -2152,7 +2152,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T> R notLikeRight(LambdaGetter<T> column, Object value, boolean isEffective) { public <T> R notLikeRight(LambdaGetter<T> column, Object value, boolean isEffective) {
if (isEffective) { if (isEffective) {
and(QueryMethods.column(column).notLikeRight(value, true)); and(QueryMethods.column(column).notLikeRight_(value));
} }
return (R) this; return (R) this;
} }
@ -2167,7 +2167,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <V> R notLikeRight(String column, V value, Predicate<V> isEffective) { public <V> R notLikeRight(String column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).notLikeRight(value, true)); and(QueryMethods.column(column).notLikeRight_(value));
} }
return (R) this; return (R) this;
} }
@ -2182,7 +2182,7 @@ public class QueryWrapperAdapter<R extends QueryWrapperAdapter<R>> extends Query
@Override @Override
public <T, V> R notLikeRight(LambdaGetter<T> column, V value, Predicate<V> isEffective) { public <T, V> R notLikeRight(LambdaGetter<T> column, V value, Predicate<V> isEffective) {
if (isEffective.test(value)) { if (isEffective.test(value)) {
and(QueryMethods.column(column).notLikeRight(value, true)); and(QueryMethods.column(column).notLikeRight_(value));
} }
return (R) this; return (R) this;
} }