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

Merge pull request #921 from tmlx1990/fix920

Browse Source 
Fix: 920 修改格式化SQL不能解析带注释的SQL的问题
This commit is contained in:
ji
2023-12-07 23:14:11 +08:00
committed by GitHub
parent 2c162f2f51 add658c7b5
commit 15807f613b
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

@ -97,6 +97,11 @@
<artifactId>spring-context</artifactId>
</dependency>
<dependency>
<groupId>com.manticore-projects.jsqlformatter</groupId>
<artifactId>jsqlformatter</artifactId>
<version>1.0.0</version>
</dependency>
</dependencies>
</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.web.api.aspect.ConnectionInfoAspect;
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 org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
@ -19,18 +19,19 @@ public class SqlController {
/**
* SQL Format
*
* @param sqlFormatRequest
* @return
*/
@GetMapping("/format")
public DataResult<String> list(@Valid SqlFormatRequest sqlFormatRequest) {
String sql = sqlFormatRequest.getSql();
try {
sql = SqlFormatter.format(sql);
sql = JSQLFormatter.format(sql);
} catch (Exception e) {
// ignore
}
return DataResult.of(sql);
}
}