diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/BaseDbAdaptor.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/BaseDbAdaptor.java
index b368f103c..de041f7a2 100644
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/BaseDbAdaptor.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/BaseDbAdaptor.java
@@ -10,6 +10,7 @@ import java.sql.DatabaseMetaData;
 import java.sql.DriverManager;
 import java.sql.ResultSet;
 import java.sql.SQLException;
+import java.util.ArrayList;
 import java.util.List;
 
 @Slf4j
@@ -40,14 +41,19 @@ public abstract class BaseDbAdaptor implements DbAdaptor {
     }
 
     public List<String> getTables(ConnectInfo connectionInfo, String schemaName) throws SQLException {
-        List<String> tables = Lists.newArrayList();
+        List<String> tablesAndViews = new ArrayList<>();
         DatabaseMetaData metaData = getDatabaseMetaData(connectionInfo);
-        ResultSet tableSet = metaData.getTables(schemaName, schemaName, null, new String[]{"TABLE"});
-        while (tableSet.next()) {
-            String tableName = tableSet.getString("TABLE_NAME");
-            tables.add(tableName);
+
+        try (ResultSet resultSet = metaData.getTables(null, schemaName, null,
+                new String[]{"TABLE", "VIEW"})) {
+            while (resultSet.next()) {
+                String name = resultSet.getString("TABLE_NAME");
+                tablesAndViews.add(name);
+            }
+        } catch (SQLException e) {
+            log.error("Failed to get tables and views", e);
         }
-        return tables;
+        return tablesAndViews;
     }
 
     public List<DBColumn> getColumns(ConnectInfo connectInfo, String schemaName, String tableName) throws SQLException {
diff --git a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/PostgresqlAdaptor.java b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/PostgresqlAdaptor.java
index f92c7d5d0..71139799c 100644
--- a/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/PostgresqlAdaptor.java
+++ b/headless/core/src/main/java/com/tencent/supersonic/headless/core/adaptor/db/PostgresqlAdaptor.java
@@ -6,6 +6,7 @@ import com.tencent.supersonic.common.pojo.Constants;
 import com.tencent.supersonic.common.pojo.enums.TimeDimensionEnum;
 import com.tencent.supersonic.headless.api.pojo.DBColumn;
 import com.tencent.supersonic.headless.core.pojo.ConnectInfo;
+import lombok.extern.slf4j.Slf4j;
 import net.sf.jsqlparser.expression.StringValue;
 import net.sf.jsqlparser.expression.operators.relational.ExpressionList;
 
@@ -18,6 +19,7 @@ import java.util.Map;
 import java.util.Objects;
 import java.util.function.UnaryOperator;
 
+@Slf4j
 public class PostgresqlAdaptor extends BaseDbAdaptor {
 
     @Override
@@ -77,14 +79,18 @@ public class PostgresqlAdaptor extends BaseDbAdaptor {
     }
 
     public List<String> getTables(ConnectInfo connectionInfo, String schemaName) throws SQLException {
-        List<String> tables = Lists.newArrayList();
+        List<String> tablesAndViews = Lists.newArrayList();
         DatabaseMetaData metaData = getDatabaseMetaData(connectionInfo);
-        ResultSet tableSet = metaData.getTables(null, null, null, new String[]{"TABLE"});
-        while (tableSet.next()) {
-            String tableName = tableSet.getString("TABLE_NAME");
-            tables.add(tableName);
+        try (ResultSet resultSet = metaData.getTables(null, null, null,
+                new String[]{"TABLE", "VIEW"})) {
+            while (resultSet.next()) {
+                String name = resultSet.getString("TABLE_NAME");
+                tablesAndViews.add(name);
+            }
+        } catch (SQLException e) {
+            log.error("Failed to get tables and views", e);
         }
-        return tables;
+        return tablesAndViews;
     }
 
     public List<DBColumn> getColumns(ConnectInfo connectInfo, String schemaName, String tableName) throws SQLException {