From 0180110e93f240e726e83cd0d86b9df381c312d6 Mon Sep 17 00:00:00 2001
From: taojinlong <jinlong@fit2cloud.com>
Date: Mon, 5 Aug 2024 16:33:33 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20=E6=94=AF=E6=8C=81=E8=A7=A3=E6=9E=90?=
 =?UTF-8?q?=E5=A4=9A=E9=87=8D=E5=B0=8F=E6=8B=AC=E5=8F=B7=E7=9A=84sql?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../commons/utils/SqlparserUtils.java         | 57 ++++++++++++-------
 .../io/dataease/dataset/utils/FieldUtils.java |  1 +
 2 files changed, 36 insertions(+), 22 deletions(-)

diff --git a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java
index 13b3b32f26..bb6f9c2c38 100644
--- a/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java
+++ b/core/core-backend/src/main/java/io/dataease/commons/utils/SqlparserUtils.java
@@ -101,34 +101,47 @@ public class SqlparserUtils {
     private static void handleFromItems(PlainSelect plainSelect, String dsType) throws Exception {
         FromItem fromItem = plainSelect.getFromItem();
         if (fromItem instanceof ParenthesedSelect) {
-            if (((ParenthesedSelect) fromItem).getSelect() instanceof SetOperationList) {
-                StringBuilder result = new StringBuilder();
-                SetOperationList setOperationList = (SetOperationList) ((ParenthesedSelect) fromItem).getSelect().getSelectBody();
-                for (int i = 0; i < setOperationList.getSelects().size(); i++) {
-                    result.append(handlePlainSelect((PlainSelect) setOperationList.getSelects().get(i), null, dsType));
-                    if (i < setOperationList.getSelects().size() - 1) {
-                        result.append(" ").append(setOperationList.getOperations().get(i).toString()).append(" ");
-                    }
-                }
-            } else {
-                PlainSelect selectBody = ((ParenthesedSelect) fromItem).getSelect().getPlainSelect();
-                Select subSelectTmp = (Select) CCJSqlParserUtil.parse(removeVariables(selectBody.toString(), dsType));
-                ((ParenthesedSelect) fromItem).setSelect(subSelectTmp.getSelectBody());
-                if (dsType.equals(DatasourceConfiguration.DatasourceType.oracle.getType())) {
-                    if (fromItem.getAlias() != null) {
-                        fromItem.setAlias(new Alias(fromItem.getAlias().toString(), false));
-                    }
-                } else {
-                    if (fromItem.getAlias() == null) {
-                        throw new Exception("Failed to parse sql, Every derived table must have its own alias！");
-                    }
-                    fromItem.setAlias(new Alias(fromItem.getAlias().toString(), false));
+            handleParenthesedSelect(fromItem, dsType);
+            plainSelect.setFromItem(fromItem);
+        } else {
+            if (fromItem instanceof ParenthesedFromItem) {
+                fromItem = ((ParenthesedFromItem) fromItem).getFromItem();
+                while (fromItem instanceof ParenthesedFromItem) {
+                    fromItem = ((ParenthesedFromItem) fromItem).getFromItem();
                 }
+                handleParenthesedSelect(fromItem, dsType);
             }
             plainSelect.setFromItem(fromItem);
         }
     }
 
+    private static void handleParenthesedSelect(FromItem fromItem, String dsType) throws Exception {
+        if (((ParenthesedSelect) fromItem).getSelect() instanceof SetOperationList) {
+            StringBuilder result = new StringBuilder();
+            SetOperationList setOperationList = (SetOperationList) ((ParenthesedSelect) fromItem).getSelect().getSelectBody();
+            for (int i = 0; i < setOperationList.getSelects().size(); i++) {
+                result.append(handlePlainSelect((PlainSelect) setOperationList.getSelects().get(i), null, dsType));
+                if (i < setOperationList.getSelects().size() - 1) {
+                    result.append(" ").append(setOperationList.getOperations().get(i).toString()).append(" ");
+                }
+            }
+        } else {
+            PlainSelect selectBody = ((ParenthesedSelect) fromItem).getSelect().getPlainSelect();
+            Select subSelectTmp = (Select) CCJSqlParserUtil.parse(removeVariables(selectBody.toString(), dsType));
+            ((ParenthesedSelect) fromItem).setSelect(subSelectTmp.getSelectBody());
+            if (dsType.equals(DatasourceConfiguration.DatasourceType.oracle.getType())) {
+                if (fromItem.getAlias() != null) {
+                    fromItem.setAlias(new Alias(fromItem.getAlias().toString(), false));
+                }
+            } else {
+                if (fromItem.getAlias() == null) {
+                    throw new Exception("Failed to parse sql, Every derived table must have its own alias！");
+                }
+                fromItem.setAlias(new Alias(fromItem.getAlias().toString(), false));
+            }
+        }
+    }
+
     private static void handleJoins(PlainSelect plainSelect, String dsType) throws Exception {
         List<Join> joins = plainSelect.getJoins();
         if (joins != null) {
diff --git a/core/core-backend/src/main/java/io/dataease/dataset/utils/FieldUtils.java b/core/core-backend/src/main/java/io/dataease/dataset/utils/FieldUtils.java
index 1e64e177b8..913a1c4537 100644
--- a/core/core-backend/src/main/java/io/dataease/dataset/utils/FieldUtils.java
+++ b/core/core-backend/src/main/java/io/dataease/dataset/utils/FieldUtils.java
@@ -30,6 +30,7 @@ public class FieldUtils {
             case "DATETIMEOFFSET":
             case "SMALLDATETIME":
             case "DATETIME64":
+            case "_TIMESTAMPTZ":
                 return 1;// 时间
             case "INT":
             case "SMALLINT":