lsm/hutool
1
0
Fork 0
mirror of https://gitee.com/dromara/hutool.git synced 2026-02-09 09:16:26 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #4042 from sunshineflymeat/hutool-0829

Browse Source 
Fix issue 4040
This commit is contained in:
Golden Looly
2025-08-29 12:00:13 +08:00
committed by GitHub
parent bd123386ce 32a5ff53b6
commit 273c53f672
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
hutool-db/src/main/java/cn/hutool/db/sql/Condition.java
View File

@@ -257,6 +257,17 @@ public class Condition extends CloneSupport<Condition> {
return OPERATOR_IS.equalsIgnoreCase(this.operator);
}
/**
* 是否 IS NOT条件
*
* @return 是否IS NOT条件
* @since 5.8.0
*/
public boolean isOperatorIsNot() {
return OPERATOR_IS_NOT.equalsIgnoreCase(this.operator);
}
/**
* 是否LIKE条件
*
@@ -268,18 +279,24 @@ public class Condition extends CloneSupport<Condition> {
}
/**
* 检查值是否为null，如果为null转换为 "IS NULL"形式
* 检查值是否为null，如果为null转换为 "IS NULL"或"IS NOT NULL"形式
*
* @return this
*/
public Condition checkValueNull() {
if (null == this.value) {
this.operator = OPERATOR_IS;
// 检查是否为"不等于"操作符（包括!=和<>）
if ("!=".equalsIgnoreCase(this.operator) || "<>".equalsIgnoreCase(this.operator)) {
this.operator = OPERATOR_IS_NOT;
} else {
this.operator = OPERATOR_IS;
}
this.value = VALUE_NULL;
}
return this;
}
/**
* 获得between 类型中第二个值
*
@@ -345,8 +362,8 @@ public class Condition extends CloneSupport<Condition> {
// 类似：" (?,?,?)" 或者 " (1,2,3,4)"
buildValuePartForIN(conditionStrBuilder, paramValues);
} else {
if (isPlaceHolder() && false == isOperatorIs()) {
// 使用条件表达式占位符，条件表达式并不适用于 IS NULL
if (isPlaceHolder() && !isOperatorIs() && !isOperatorIsNot()) {
// 使用条件表达式占位符，条件表达式并不适用于 IS NULL 和 IS NOT NULL
conditionStrBuilder.append(" ?");
if (null != paramValues) {
paramValues.add(this.value);
@@ -355,7 +372,7 @@ public class Condition extends CloneSupport<Condition> {
// 直接使用条件值
final String valueStr = String.valueOf(this.value);
conditionStrBuilder.append(" ").append(isOperatorLike() ?
StrUtil.wrap(valueStr, "'") : valueStr);
StrUtil.wrap(valueStr, "'") : valueStr);
}
}

9
hutool-db/src/test/java/cn/hutool/db/sql/ConditionTest.java
View File

@@ -12,9 +12,18 @@ public class ConditionTest {
Condition conditionNull = new Condition("user", null);
assertEquals("user IS NULL", conditionNull.toString());
Condition conditionNull2 = new Condition("user", "=", (String) null);
assertEquals("user IS NULL", conditionNull2.toString());
Condition conditionNotNull = new Condition("user", "!= null");
assertEquals("user IS NOT NULL", conditionNotNull.toString());
Condition conditionNotNull2 = new Condition("user", "!=", (String) null);
assertEquals("user IS NOT NULL", conditionNotNull2.toString());
Condition conditionNotNull3 = new Condition("user", "<>", (String) null);
assertEquals("user IS NOT NULL", conditionNotNull3.toString());
Condition condition2 = new Condition("user", "= zhangsan");
assertEquals("user = ?", condition2.toString());