[Core] [Manager] Support some functions (#353)

devlive-community · May 22, 2023 · a0ebb8c · a0ebb8c
2 parents 9e14384 + 3eef453
commit a0ebb8c
Show file tree

Hide file tree

Showing 17 changed files with 673 additions and 182 deletions.
diff --git a/core/datacap-common/src/main/java/io/edurt/datacap/common/sql/SqlBuilder.java b/core/datacap-common/src/main/java/io/edurt/datacap/common/sql/SqlBuilder.java
@@ -66,6 +66,10 @@ private String getSelect()
         SelectBuilder.SELECT(applySelectColumns());
         SelectBuilder.FROM(applyDatabaseAndTable());
 
+        if (StringUtils.isNotEmpty(configure.getWhere())) {
+            SelectBuilder.WHERE(configure.getWhere());
+        }
+
         if (ObjectUtils.isNotEmpty(configure.getOrders())) {
             SelectBuilder.ORDER_BY(applyOrderByColumns());
         }

diff --git a/core/datacap-common/src/main/java/io/edurt/datacap/common/sql/configure/SqlBody.java b/core/datacap-common/src/main/java/io/edurt/datacap/common/sql/configure/SqlBody.java
@@ -19,5 +19,6 @@ public class SqlBody
     private List<SqlColumn> orders;
     private int limit = 10;
     private int offset = 1;
+    private String where;
     private SqlType type;
 }
diff --git a/core/datacap-server/src/main/resources/data.sql b/core/datacap-server/src/main/resources/data.sql
@@ -92,6 +92,8 @@ GROUP BY
   COLUMN_TYPE', 'Gets the data column classification collection based on the provided database and data table', 'H2',
         '[{"column":"database","type":"String","expression":"${database:String}"},{"column":"table","type":"String","expression":"${table:String}"}]', TRUE),
        ('FindColumnByDatabaseAndTableAndType', 'SELECT
+  ''${database:String}'' AS TABLE_CATALOG,
+  ''${table:String}'' AS TABLE_NAME,
   COLUMN_NAME,
   COLUMN_TYPE,
   DATA_TYPE
@@ -232,6 +234,8 @@ GROUP BY
   COLUMN_TYPE', 'Gets the data column classification collection based on the provided database and data table', 'MySQL',
         '[{"column":"database","type":"String","expression":"${database:String}"},{"column":"table","type":"String","expression":"${table:String}"}]', TRUE),
        ('FindColumnByDatabaseAndTableAndType', 'SELECT
+  ''${database:String}'' AS TABLE_CATALOG,
+  ''${table:String}'' AS TABLE_NAME,
   COLUMN_NAME,
   COLUMN_TYPE,
   DATA_TYPE
@@ -285,6 +289,8 @@ FROM
 WHERE
   COLUMN_TYPE LIKE ''%${type:String}%''
 GROUP BY
+  TABLE_CATALOG,
+  TABLE_NAME,
   COLUMN_NAME,
   COLUMN_TYPE,
   DATA_TYPE
@@ -361,6 +367,8 @@ GROUP BY
   COLUMN_TYPE', 'Gets the data column classification collection based on the provided database and data table', 'ClickHouse',
         '[{"column":"database","type":"String","expression":"${database:String}"},{"column":"table","type":"String","expression":"${table:String}"}]', TRUE),
        ('FindColumnByDatabaseAndTableAndType', 'SELECT
+  ''${database:String}'' AS TABLE_CATALOG,
+  ''${table:String}'' AS TABLE_NAME,
   COLUMN_NAME,
   COLUMN_TYPE,
   DATA_TYPE
@@ -389,6 +397,8 @@ FROM
 WHERE
   COLUMN_TYPE LIKE ''%${type:String}%''
 GROUP BY
+  TABLE_CATALOG,
+  TABLE_NAME,
   COLUMN_NAME,
   COLUMN_TYPE,
   DATA_TYPE

diff --git a/core/datacap-server/src/main/resources/schema.sql b/core/datacap-server/src/main/resources/schema.sql
@@ -273,7 +273,7 @@ CREATE TABLE IF NOT EXISTS users
 TRUNCATE TABLE users;
 ALTER TABLE users
     ALTER COLUMN id RESTART WITH 1;
-INSERT INTO users (username, password, create_time)
-VALUES ('admin', '$2a$10$ee2yg.Te14GpHppDUROAi.HzYR5Q.q2/5vrZvAr4TFY3J2iT663JG', NULL);
-INSERT INTO users (username, password, create_time)
-VALUES ('datacap', '$2a$10$bZ4XBRlYUjKfkBovWT9TuuXlEF7lpRxVrXS8iqyCjCHUqy4RPTL8.', NULL);
+INSERT INTO users (username, password)
+VALUES ('admin', '$2a$10$ee2yg.Te14GpHppDUROAi.HzYR5Q.q2/5vrZvAr4TFY3J2iT663JG');
+INSERT INTO users (username, password)
+VALUES ('datacap', '$2a$10$bZ4XBRlYUjKfkBovWT9TuuXlEF7lpRxVrXS8iqyCjCHUqy4RPTL8.');