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

fix: keyword in dm dialect

Browse Source
This commit is contained in:
Michael Yang 2024-07-08 10:10:31 +08:00
parent 4af882af1a
commit 9f8e00ca9c
2 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/KeywordWrap.java
View File

@ -20,6 +20,7 @@ import com.mybatisflex.core.util.StringUtil;
import java.util.Collections; import java.util.Collections;
import java.util.Set; import java.util.Set;
import java.util.stream.Collectors;
/** /**
* 用于对数据库的关键字包装 * 用于对数据库的关键字包装
@ -97,16 +98,15 @@ public class KeywordWrap {
public KeywordWrap(boolean caseSensitive, Set<String> keywords, String prefix, String suffix) { public KeywordWrap(boolean caseSensitive, Set<String> keywords, String prefix, String suffix) {
this.caseSensitive = caseSensitive; this.caseSensitive = caseSensitive;
this.keywords = keywords; this.keywords = keywords.stream().map(String::toUpperCase).collect(Collectors.toSet());
this.prefix = prefix; this.prefix = prefix;
this.suffix = suffix; this.suffix = suffix;
} }
public KeywordWrap(boolean caseSensitive, boolean keywordsToUpperCase, Set<String> keywords, String prefix, public KeywordWrap(boolean caseSensitive, boolean keywordsToUpperCase, Set<String> keywords, String prefix, String suffix) {
String suffix) {
this.caseSensitive = caseSensitive; this.caseSensitive = caseSensitive;
this.keywordsToUpperCase = keywordsToUpperCase; this.keywordsToUpperCase = keywordsToUpperCase;
this.keywords = keywords; this.keywords = keywords.stream().map(String::toUpperCase).collect(Collectors.toSet());
this.prefix = prefix; this.prefix = prefix;
this.suffix = suffix; this.suffix = suffix;
} }
@ -120,8 +120,12 @@ public class KeywordWrap {
return prefix + keyword + suffix; return prefix + keyword + suffix;
} }
keyword = keywordsToUpperCase ? keyword.toUpperCase() : keyword; if (keywordsToUpperCase) {
keyword = keyword.toUpperCase();
return keywords.contains(keyword) ? (prefix + keyword + suffix) : keyword; return keywords.contains(keyword) ? (prefix + keyword + suffix) : keyword;
} else {
return keywords.contains(keyword.toUpperCase()) ? (prefix + keyword + suffix) : keyword;
}
} }
public boolean isCaseSensitive() { public boolean isCaseSensitive() {

1
mybatis-flex-core/src/main/java/com/mybatisflex/core/dialect/impl/DmDialect.java
View File

@ -69,7 +69,6 @@ public class DmDialect extends CommonsDialectImpl {
"SQL", "WHERE", "MIN", "PROCEDURE", "SQLCODE", "WHILE", "MINUS", "PUBLIC", "SQLERRM", "WITH", "MLSLABEL", "RAISE", "START", "SQL", "WHERE", "MIN", "PROCEDURE", "SQLCODE", "WHILE", "MINUS", "PUBLIC", "SQLERRM", "WITH", "MLSLABEL", "RAISE", "START",
"WORK", "MOD", "RANGE", "STATEMENT", "XOR", "MODE", "REAL", "STDDEV", "NATURAL", "RECORD", "SUBTYPE", "GEN", "KP", "L", "WORK", "MOD", "RANGE", "STATEMENT", "XOR", "MODE", "REAL", "STDDEV", "NATURAL", "RECORD", "SUBTYPE", "GEN", "KP", "L",
"NA", "NC", "ND", "NL", "NM", "NR", "NS", "NT", "NZ", "TTC", "UPI", "O", "S", "XA" "NA", "NC", "ND", "NL", "NM", "NR", "NS", "NT", "NZ", "TTC", "UPI", "O", "S", "XA"
); );
public DmDialect() { public DmDialect() {