opensource/Chat2DB
1
0
Fork 0
mirror of https://github.com/CodePhiliaX/Chat2DB.git synced 2025-07-29 18:53:12 +08:00
Code Issues Packages Projects Releases Wiki Activity

hutool的SQL格式化，不能处理带注释的内容。

Browse Source 
修改为使用JSQLFormatter开源项目来处理。
This commit is contained in:
tmlx1990
2023-12-06 18:13:48 +08:00
parent 2b15025f4b
commit add658c7b5
2 changed files with 9 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
chat2db-server/chat2db-server-web/chat2db-server-web-api/pom.xml
View File

@ -89,6 +89,11 @@
<artifactId>java-jwt</artifactId> <artifactId>java-jwt</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.manticore-projects.jsqlformatter</groupId>
<artifactId>jsqlformatter</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies> </dependencies>
</project> </project>

7
chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/sql/SqlController.java
View File

@ -3,7 +3,7 @@ package ai.chat2db.server.web.api.controller.sql;
import ai.chat2db.server.tools.base.wrapper.result.DataResult; import ai.chat2db.server.tools.base.wrapper.result.DataResult;
import ai.chat2db.server.web.api.aspect.ConnectionInfoAspect; import ai.chat2db.server.web.api.aspect.ConnectionInfoAspect;
import ai.chat2db.server.web.api.controller.sql.request.SqlFormatRequest; import ai.chat2db.server.web.api.controller.sql.request.SqlFormatRequest;
import cn.hutool.db.sql.SqlFormatter; import com.manticore.jsqlformatter.JSQLFormatter;
import jakarta.validation.Valid; import jakarta.validation.Valid;
import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
@ -19,18 +19,19 @@ public class SqlController {
/** /**
* SQL Format * SQL Format
*
* @param sqlFormatRequest * @param sqlFormatRequest
* @return * @return
*/ */
@GetMapping("/format") @GetMapping("/format")
public DataResult<String> list(@Valid SqlFormatRequest sqlFormatRequest) { public DataResult<String> list(@Valid SqlFormatRequest sqlFormatRequest) {
String sql = sqlFormatRequest.getSql(); String sql = sqlFormatRequest.getSql();
try { try {
sql = SqlFormatter.format(sql); sql = JSQLFormatter.format(sql);
} catch (Exception e) { } catch (Exception e) {
// ignore // ignore
} }
return DataResult.of(sql); return DataResult.of(sql);
} }
} }