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

feat: optimize QueryColumn

Browse Source
This commit is contained in:
开源海哥 2023-10-17 11:36:06 +08:00
parent 177129579e
commit 86034295d1
1 changed files with 50 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -399,7 +399,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
@Override @Override
public QueryCondition in(Collection<?> value) { public QueryCondition in(Collection<?> value) {
if (value == null) { if (value == null || value.isEmpty()) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return in(value.toArray()); return in(value.toArray());
@ -407,7 +407,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
@Override @Override
public QueryCondition in(Collection<?> value, boolean isEffective) { public QueryCondition in(Collection<?> value, boolean isEffective) {
if (value == null) { if (value == null || value.isEmpty()) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return in(value.toArray()).when(isEffective); return in(value.toArray()).when(isEffective);
@ -415,7 +415,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
@Override @Override
public QueryCondition in(Collection<?> value, BooleanSupplier isEffective) { public QueryCondition in(Collection<?> value, BooleanSupplier isEffective) {
if (value == null) { if (value == null || value.isEmpty()) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return in(value.toArray()).when(isEffective); return in(value.toArray()).when(isEffective);
@ -423,7 +423,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
@Override @Override
public <T extends Collection<?>> QueryCondition in(T value, Predicate<T> isEffective) { public <T extends Collection<?>> QueryCondition in(T value, Predicate<T> isEffective) {
if (value == null) { if (value == null || value.isEmpty()) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return in(value.toArray()).when(isEffective.test(value)); return in(value.toArray()).when(isEffective.test(value));
@ -523,7 +523,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
@Override @Override
public QueryCondition notIn(Collection<?> value) { public QueryCondition notIn(Collection<?> value) {
if (value == null) { if (value == null || value.isEmpty()) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return notIn(value.toArray()); return notIn(value.toArray());
@ -531,7 +531,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
@Override @Override
public QueryCondition notIn(Collection<?> value, boolean isEffective) { public QueryCondition notIn(Collection<?> value, boolean isEffective) {
if (value == null) { if (value == null || value.isEmpty()) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return notIn(value.toArray()).when(isEffective); return notIn(value.toArray()).when(isEffective);
@ -539,7 +539,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
@Override @Override
public QueryCondition notIn(Collection<?> value, BooleanSupplier isEffective) { public QueryCondition notIn(Collection<?> value, BooleanSupplier isEffective) {
if (value == null) { if (value == null || value.isEmpty()) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return notIn(value.toArray()).when(isEffective); return notIn(value.toArray()).when(isEffective);
@ -547,7 +547,7 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
@Override @Override
public <T extends Collection<?>> QueryCondition notIn(T value, Predicate<T> isEffective) { public <T extends Collection<?>> QueryCondition notIn(T value, Predicate<T> isEffective) {
if (value == null) { if (value == null || value.isEmpty()) {
return QueryCondition.createEmpty(); return QueryCondition.createEmpty();
} }
return notIn(value.toArray()).when(isEffective.test(value)); return notIn(value.toArray()).when(isEffective.test(value));
@ -579,41 +579,65 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
@Override @Override
public QueryCondition between(Object start, Object end) { public QueryCondition between(Object start, Object end) {
if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
return QueryCondition.createEmpty();
}
return QueryCondition.create(this, SqlOperator.BETWEEN, new Object[]{start, end}); return QueryCondition.create(this, SqlOperator.BETWEEN, new Object[]{start, end});
} }
@Override @Override
public QueryCondition between(Object start, Object end, boolean isEffective) { public QueryCondition between(Object start, Object end, boolean isEffective) {
if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
return QueryCondition.createEmpty();
}
return QueryCondition.create(this, SqlOperator.BETWEEN, new Object[]{start, end}).when(isEffective); return QueryCondition.create(this, SqlOperator.BETWEEN, new Object[]{start, end}).when(isEffective);
} }
@Override @Override
public QueryCondition between(Object start, Object end, BooleanSupplier isEffective) { public QueryCondition between(Object start, Object end, BooleanSupplier isEffective) {
if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
return QueryCondition.createEmpty();
}
return QueryCondition.create(this, SqlOperator.BETWEEN, new Object[]{start, end}).when(isEffective); return QueryCondition.create(this, SqlOperator.BETWEEN, new Object[]{start, end}).when(isEffective);
} }
@Override @Override
public <S, E> QueryCondition between(S start, E end, BiPredicate<S, E> isEffective) { public <S, E> QueryCondition between(S start, E end, BiPredicate<S, E> isEffective) {
if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
return QueryCondition.createEmpty();
}
return QueryCondition.create(this, SqlOperator.BETWEEN, new Object[]{start, end}).when(isEffective.test(start, end)); return QueryCondition.create(this, SqlOperator.BETWEEN, new Object[]{start, end}).when(isEffective.test(start, end));
} }
@Override @Override
public QueryCondition notBetween(Object start, Object end) { public QueryCondition notBetween(Object start, Object end) {
if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
return QueryCondition.createEmpty();
}
return QueryCondition.create(this, SqlOperator.NOT_BETWEEN, new Object[]{start, end}); return QueryCondition.create(this, SqlOperator.NOT_BETWEEN, new Object[]{start, end});
} }
@Override @Override
public QueryCondition notBetween(Object start, Object end, boolean isEffective) { public QueryCondition notBetween(Object start, Object end, boolean isEffective) {
if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
return QueryCondition.createEmpty();
}
return QueryCondition.create(this, SqlOperator.NOT_BETWEEN, new Object[]{start, end}).when(isEffective); return QueryCondition.create(this, SqlOperator.NOT_BETWEEN, new Object[]{start, end}).when(isEffective);
} }
@Override @Override
public QueryCondition notBetween(Object start, Object end, BooleanSupplier isEffective) { public QueryCondition notBetween(Object start, Object end, BooleanSupplier isEffective) {
if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
return QueryCondition.createEmpty();
}
return QueryCondition.create(this, SqlOperator.NOT_BETWEEN, new Object[]{start, end}).when(isEffective); return QueryCondition.create(this, SqlOperator.NOT_BETWEEN, new Object[]{start, end}).when(isEffective);
} }
@Override @Override
public <S, E> QueryCondition notBetween(S start, E end, BiPredicate<S, E> isEffective) { public <S, E> QueryCondition notBetween(S start, E end, BiPredicate<S, E> isEffective) {
if (QueryColumnBehavior.shouldIgnoreValue(start) || QueryColumnBehavior.shouldIgnoreValue(end)) {
return QueryCondition.createEmpty();
}
return QueryCondition.create(this, SqlOperator.NOT_BETWEEN, new Object[]{start, end}).when(isEffective.test(start, end)); return QueryCondition.create(this, SqlOperator.NOT_BETWEEN, new Object[]{start, end}).when(isEffective.test(start, end));
} }
@ -717,6 +741,9 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
* {@code LIKE value} * {@code LIKE value}
*/ */
public QueryCondition likeRaw(Object value) { public QueryCondition likeRaw(Object value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty();
}
return likeRaw(value, true); return likeRaw(value, true);
} }
@ -734,6 +761,9 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
* {@code LIKE value} * {@code LIKE value}
*/ */
public QueryCondition likeRaw(Object value, BooleanSupplier isEffective) { public QueryCondition likeRaw(Object value, BooleanSupplier isEffective) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty();
}
return likeRaw(value, isEffective.getAsBoolean()); return likeRaw(value, isEffective.getAsBoolean());
} }
@ -741,6 +771,9 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
* {@code LIKE value} * {@code LIKE value}
*/ */
public <T> QueryCondition likeRaw(T value, Predicate<T> isEffective) { public <T> QueryCondition likeRaw(T value, Predicate<T> isEffective) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty();
}
return likeRaw(value, isEffective.test(value)); return likeRaw(value, isEffective.test(value));
} }
@ -844,6 +877,9 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
* {@code NOT LIKE value} * {@code NOT LIKE value}
*/ */
public QueryCondition notLikeRaw(Object value) { public QueryCondition notLikeRaw(Object value) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty();
}
return likeRaw(value, true); return likeRaw(value, true);
} }
@ -861,6 +897,9 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
* {@code NOT LIKE value} * {@code NOT LIKE value}
*/ */
public QueryCondition notLikeRaw(Object value, BooleanSupplier isEffective) { public QueryCondition notLikeRaw(Object value, BooleanSupplier isEffective) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty();
}
return likeRaw(value, isEffective.getAsBoolean()); return likeRaw(value, isEffective.getAsBoolean());
} }
@ -868,6 +907,9 @@ public class QueryColumn implements CloneSupport<QueryColumn>, Conditional<Query
* {@code NOT LIKE value} * {@code NOT LIKE value}
*/ */
public <T> QueryCondition notLikeRaw(T value, Predicate<T> isEffective) { public <T> QueryCondition notLikeRaw(T value, Predicate<T> isEffective) {
if (QueryColumnBehavior.shouldIgnoreValue(value)) {
return QueryCondition.createEmpty();
}
return likeRaw(value, isEffective.test(value)); return likeRaw(value, isEffective.test(value));
} }