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 code

Browse Source
This commit is contained in:
Looly
2023-12-29 20:55:55 +08:00
parent 91178e45a8
commit 6facfcfc4d
101 changed files with 271 additions and 307 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
hutool-db/src/main/java/org/dromara/hutool/db/Session.java
View File

@@ -18,7 +18,6 @@ import org.dromara.hutool.db.dialect.Dialect;
import org.dromara.hutool.db.dialect.DialectFactory;
import org.dromara.hutool.db.ds.DSUtil;
import org.dromara.hutool.log.Log;
import org.dromara.hutool.log.LogFactory;
import javax.sql.DataSource;
import java.io.Closeable;

49
hutool-db/src/main/java/org/dromara/hutool/db/sql/SqlFormatter.java
View File

@@ -72,6 +72,12 @@ public class SqlFormatter {
private static final String indentString = " ";
private static final String initial = "\n ";
/**
* 格式化
*
* @param source SQL语句
* @return 格式化后的SQL
*/
public static String format(final String source) {
return new FormatProcess(source).perform().trim();
}
@@ -110,24 +116,31 @@ public class SqlFormatter {
this.token = this.tokens.nextToken();
this.lcToken = this.token.toLowerCase();
if ("'".equals(this.token)) {
String t;
do {
t = this.tokens.nextToken();
this.token += t;
} while ((!"'".equals(t)) && (this.tokens.hasMoreTokens()));
} else if ("\"".equals(this.token)) {
String t;
do {
t = this.tokens.nextToken();
this.token += t;
} while (!"\"".equals(t));
} else if ("`".equals(this.token)) {
String t;
do {
t = this.tokens.nextToken();
this.token += t;
} while (!"`".equals(t));
switch (this.token) {
case "'": {
String t;
do {
t = this.tokens.nextToken();
this.token += t;
} while ((!"'".equals(t)) && (this.tokens.hasMoreTokens()));
break;
}
case "\"": {
String t;
do {
t = this.tokens.nextToken();
this.token += t;
} while (!"\"".equals(t));
break;
}
case "`": {
String t;
do {
t = this.tokens.nextToken();
this.token += t;
} while (!"`".equals(t));
break;
}
}
if ((this.afterByOrSetOrFromOrSelect) && (",".equals(this.token))) {