Merge pull request edp963#2224 from IronJy/dev-0.3

fix: format sql with different utility functions
hangzhi7 · Jul 9, 2021 · 2a89c94 · 2a89c94
2 parents 8b54df7 + 13233f5
commit 2a89c94
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/server/src/main/java/edp/core/utils/SqlUtils.java b/server/src/main/java/edp/core/utils/SqlUtils.java
@@ -1079,9 +1079,18 @@ public String getJdbcUrl() {
         return this.jdbcSourceInfo.getJdbcUrl();
     }
 
-    public static String formatSql(String sql) {
+    public String formatSql(String sql) {
         try {
-            return SQLUtils.formatMySql(sql);
+            switch (dataTypeEnum) {
+                case ORACLE:
+                    return SQLUtils.formatOracle(sql);
+                case MYSQL:
+                    return SQLUtils.formatMySql(sql);
+                case HIVE2:
+                    return SQLUtils.formatHive(sql);
+                default:
+                    return sql;
+            }
         } catch (Exception e) {
             // ignore
         }

diff --git a/server/src/main/java/edp/davinci/service/excel/SheetWorker.java b/server/src/main/java/edp/davinci/service/excel/SheetWorker.java
@@ -89,7 +89,7 @@ public T call() {
             Set<String> queryFromsAndJoins = SqlUtils.getQueryFromsAndJoins(sql);
             if (log) {
                 logger.info("Task({}) sheet worker(name:{}, sheetNo:{}, sheetName:{}) query start sql:{}, md5:{}",
-                        context.getTaskKey(), context.getName(), context.getSheetNo(), context.getSheet().getSheetName(), SqlUtils.formatSql(sql), md5);
+                        context.getTaskKey(), context.getName(), context.getSheetNo(), context.getSheet().getSheetName(), utils.formatSql(sql), md5);
             }
 
             final AtomicInteger count = new AtomicInteger(0);