diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/pom.xml b/chat2db-server/chat2db-server-web/chat2db-server-web-api/pom.xml index 590b8421..9d80aad7 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/pom.xml +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/pom.xml @@ -89,6 +89,11 @@ java-jwt + + com.manticore-projects.jsqlformatter + jsqlformatter + 1.0.0 + diff --git a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/sql/SqlController.java b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/sql/SqlController.java index 17bcfa61..d7b8e0b2 100644 --- a/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/sql/SqlController.java +++ b/chat2db-server/chat2db-server-web/chat2db-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/sql/SqlController.java @@ -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 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); } + }