revert(data): 还原 SQL 函数接口

continew-org · Sep 4, 2024 · 9e5f33b · 9e5f33b
1 parent 260f484
commit 9e5f33b
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 5 deletions.
diff --git a/...ew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/DatabaseType.java b/...ew-starter-data-core/src/main/java/top/continew/starter/data/core/enums/DatabaseType.java
@@ -18,6 +18,8 @@
 
 import top.continew.starter.data.core.function.ISqlFunction;
 
+import java.io.Serializable;
+
 /**
  * 数据库类型枚举
  *
@@ -31,8 +33,8 @@ public enum DatabaseType implements ISqlFunction {
      */
     MYSQL("MySQL") {
         @Override
-        public String findInSet() {
-            return "find_in_set({0}, {1}) <> 0";
+        public String findInSet(Serializable value, String set) {
+            return "find_in_set('%s', %s) <> 0".formatted(value, set);
         }
     },
 
@@ -41,8 +43,8 @@ public String findInSet() {
      */
     POSTGRE_SQL("PostgreSQL") {
         @Override
-        public String findInSet() {
-            return "(select position(',{0},' in ','||{1}||',')) <> 0";
+        public String findInSet(Serializable value, String set) {
+            return "(select position(',%s,' in ','||%s||',')) <> 0".formatted(value, set);
         }
     },;
 

diff --git a/...starter-data-core/src/main/java/top/continew/starter/data/core/function/ISqlFunction.java b/...starter-data-core/src/main/java/top/continew/starter/data/core/function/ISqlFunction.java
@@ -16,6 +16,8 @@
 
 package top.continew.starter.data.core.function;
 
+import java.io.Serializable;
+
 /**
  * SQL 函数接口
  *
@@ -27,7 +29,9 @@ public interface ISqlFunction {
     /**
      * find_in_set 函数
      *
+     * @param value 值
+     * @param set   集合
      * @return 函数实现
      */
-    String findInSet();
+    String findInSet(Serializable value, String set);
 }