Merge pull request #936 from chat2db/dev

Dev
CodePhiliaX · Dec 7, 2023 · c37dd7f · c37dd7f
2 parents 0af4176 + 15807f6
commit c37dd7f
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 4 deletions.
diff --git a/...b-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/Dbutils.java b/...b-server-domain-repository/src/main/java/ai/chat2db/server/domain/repository/Dbutils.java
@@ -199,7 +199,7 @@ private static void registryMapperXml(MybatisConfiguration configuration, String
                 Enumeration<JarEntry> entries = jarFile.entries();
                 while (entries.hasMoreElements()) {
                     JarEntry jarEntry = entries.nextElement();
-                    if (jarEntry.getName().endsWith(".xml")) {
+                    if (jarEntry.getName().endsWith("Mapper.xml")) {
                         InputStream in = jarFile.getInputStream(jarEntry);
                         XMLMapperBuilder xmlMapperBuilder = new XMLMapperBuilder(in, configuration, jarEntry.getName(), configuration.getSqlFragments());
                         xmlMapperBuilder.parse();

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
@@ -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>
diff --git a/...-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/sql/SqlController.java b/...-server-web-api/src/main/java/ai/chat2db/server/web/api/controller/sql/SqlController.java
@@ -3,7 +3,7 @@
 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);
     }
+
 }