zhouxy108/hutool
1
0
Fork 0
mirror of https://gitee.com/chinabugotech/hutool.git synced 2025-07-21 15:09:48 +08:00
Code Issues Packages Projects Releases Wiki Activity

fix equlas

Browse Source
This commit is contained in:
Looly
2019-12-30 07:15:07 +08:00
parent d7316b3f90
commit 5e7b9012ec
17 changed files with 441 additions and 382 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hutool-db/src/main/java/cn/hutool/db/Db.java
View File

@@ -176,6 +176,7 @@ public class Db extends AbstractDb {
final int level = transactionLevel.getLevel();
if (conn.getTransactionIsolation() < level) {
// 用户定义的事务级别如果比默认级别更严格，则按照严格的级别进行
//noinspection MagicConstant
conn.setTransactionIsolation(level);
}
}

10
hutool-db/src/main/java/cn/hutool/db/sql/SqlFormatter.java
View File

@@ -126,7 +126,7 @@ public class SqlFormatter {
values();
} else if ("on".equals(this.lcToken)) {
on();
} else if ((this.afterBetween) && (Objects.equals(this.lcToken,"and"))) {
} else if ((this.afterBetween) && ("and".equals(this.lcToken))) {
misc();
this.afterBetween = false;
} else if (LOGICAL.contains(this.lcToken)) {
@@ -213,8 +213,8 @@ public class SqlFormatter {
out();
this.indent += 1;
newline();
this.parenCounts.addLast(new Integer(this.parensSinceSelect));
this.afterByOrFromOrSelects.addLast(Boolean.valueOf(this.afterByOrSetOrFromOrSelect));
this.parenCounts.addLast(this.parensSinceSelect);
this.afterByOrFromOrSelects.addLast(this.afterByOrSetOrFromOrSelect);
this.parensSinceSelect = 0;
this.afterByOrSetOrFromOrSelect = true;
}
@@ -268,8 +268,8 @@ public class SqlFormatter {
this.parensSinceSelect -= 1;
if (this.parensSinceSelect < 0) {
this.indent -= 1;
this.parensSinceSelect = ((Integer) this.parenCounts.removeLast()).intValue();
this.afterByOrSetOrFromOrSelect = ((Boolean) this.afterByOrFromOrSelects.removeLast()).booleanValue();
this.parensSinceSelect = this.parenCounts.removeLast();
this.afterByOrSetOrFromOrSelect = this.afterByOrFromOrSelects.removeLast();
}
if (this.inFunction > 0) {
this.inFunction -= 1;