up

RockyLOMO · Dec 20, 2024 · ffc18e7 · ffc18e7
1 parent ee74de7
commit ffc18e7
Show file tree

Hide file tree

Showing 3 changed files with 40 additions and 10 deletions.
diff --git a/rxlib-x/src/main/java/org/rx/jdbc/JdbcExecutable.java b/rxlib-x/src/main/java/org/rx/jdbc/JdbcExecutable.java
@@ -12,6 +12,10 @@ public interface JdbcExecutable {
 
     ResultSet executeQuery(String sql, Object[] params, long executeTimeoutMillis);
 
+    <T> T executeScalar(String sql, Object[] params);
+
+    <T> T executeScalar(String sql, Object[] params, long executeTimeoutMillis);
+
     <T> T executeQuery(String sql, Object[] params, BiFunc<ResultSet, T> func);
 
     <T> T executeQuery(String sql, Object[] params, BiFunc<ResultSet, T> func, long executeTimeoutMillis);
@@ -32,6 +36,10 @@ public interface JdbcExecutable {
 
     ResultSet executeQuery(String sql, long executeTimeoutMillis);
 
+    <T> T executeScalar(String sql);
+
+    <T> T executeScalar(String sql, long executeTimeoutMillis);
+
     <T> T executeQuery(String sql, BiFunc<ResultSet, T> func);
 
     <T> T executeQuery(String sql, BiFunc<ResultSet, T> func, long executeTimeoutMillis);

diff --git a/rxlib-x/src/main/java/org/rx/jdbc/JdbcExecutor.java b/rxlib-x/src/main/java/org/rx/jdbc/JdbcExecutor.java
@@ -342,6 +342,22 @@ public ResultSet executeQuery(String sql, Object[] params, int cursorType, long
         }
     }
 
+    @Override
+    public <T> T executeScalar(String sql, Object[] params) {
+        return executeScalar(sql, params, executeTimeoutMillis);
+    }
+
+    @SneakyThrows
+    @Override
+    public <T> T executeScalar(String sql, Object[] params, long executeTimeoutMillis) {
+        try (ResultSet rs = executeQuery(sql, params, executeTimeoutMillis)) {
+            if (rs.next()) {
+                return (T) rs.getObject(1);
+            }
+            return null;
+        }
+    }
+
     @Override
     public <T> T executeQuery(String sql, Object[] params, BiFunc<ResultSet, T> func) {
         return executeQuery(sql, params, func, executeTimeoutMillis);
@@ -500,6 +516,22 @@ public ResultSet executeQuery(String sql, long executeTimeoutMillis) {
         }
     }
 
+    @Override
+    public <T> T executeScalar(String sql) {
+        return executeScalar(sql, executeTimeoutMillis);
+    }
+
+    @SneakyThrows
+    @Override
+    public <T> T executeScalar(String sql, long executeTimeoutMillis) {
+        try (ResultSet rs = executeQuery(sql, executeTimeoutMillis)) {
+            if (rs.next()) {
+                return (T) rs.getObject(1);
+            }
+            return null;
+        }
+    }
+
     @Override
     public <T> T executeQuery(String sql, BiFunc<ResultSet, T> func) {
         return executeQuery(sql, func, executeTimeoutMillis);

diff --git a/rxlib-x/src/main/java/org/rx/jdbc/JdbcUtil.java b/rxlib-x/src/main/java/org/rx/jdbc/JdbcUtil.java
@@ -205,16 +205,6 @@ public static void print(ResultSet resultSet) {
         }
     }
 
-    @SneakyThrows
-    public static <T> T executeScalar(ResultSet resultSet) {
-        try (ResultSet rs = resultSet) {
-            if (rs.next()) {
-                return (T) rs.getObject(1);
-            }
-            return null;
-        }
-    }
-
     public static final BiFunc<String, String> TO_CAMEL_COLUMN_MAPPING = p -> CaseFormat.LOWER_UNDERSCORE.to(CaseFormat.LOWER_CAMEL, p);
 
     public static <T> List<T> readAs(ResultSet resultSet, Type type) {