diff --git a/src/main/java/org/redkale/source/DataJdbcSource.java b/src/main/java/org/redkale/source/DataJdbcSource.java index 525ee4181..c8008be7b 100644 --- a/src/main/java/org/redkale/source/DataJdbcSource.java +++ b/src/main/java/org/redkale/source/DataJdbcSource.java @@ -2490,8 +2490,8 @@ public class DataJdbcSource extends AbstractDataSqlSource { * @return 结果数组 */ @Override - public int executeUpdate(String sql) { - return executeUpdate(new String[]{sql})[0]; + public int nativeUpdate(String sql) { + return nativeUpdate(new String[]{sql})[0]; } /** @@ -2503,7 +2503,7 @@ public class DataJdbcSource extends AbstractDataSqlSource { * @return 结果数组 */ @Override - public int[] executeUpdate(String... sqls) { + public int[] nativeUpdate(String... sqls) { if (sqls.length == 0) { return new int[0]; } @@ -2545,7 +2545,7 @@ public class DataJdbcSource extends AbstractDataSqlSource { * @return 结果 */ @Override - public V executeQuery(String sql, BiConsumer consumer, Function handler) { + public V nativeQuery(String sql, BiConsumer consumer, Function handler) { final long s = System.currentTimeMillis(); final SourceConnection conn = readPool.pollConnection(); try { @@ -2573,17 +2573,17 @@ public class DataJdbcSource extends AbstractDataSqlSource { @Deprecated public int directExecute(String sql) { - return executeUpdate(sql); + return nativeUpdate(sql); } @Deprecated public int[] directExecute(String... sqls) { - return executeUpdate(sqls); + return nativeUpdate(sqls); } @Deprecated public V directQuery(String sql, Function handler) { - return executeQuery(sql, handler); + return nativeQuery(sql, handler); } public static DataResultSet createDataResultSet(@Nullable EntityInfo info, ResultSet set) { diff --git a/src/main/java/org/redkale/source/DataMemorySource.java b/src/main/java/org/redkale/source/DataMemorySource.java index 8c77e5fe4..6105694ad 100644 --- a/src/main/java/org/redkale/source/DataMemorySource.java +++ b/src/main/java/org/redkale/source/DataMemorySource.java @@ -94,17 +94,17 @@ public class DataMemorySource extends AbstractDataSqlSource implements SearchSou } @Override - public int executeUpdate(String sql) { + public int nativeUpdate(String sql) { throw new UnsupportedOperationException("Not supported yet."); } @Override - public int[] executeUpdate(String... sqls) { + public int[] nativeUpdate(String... sqls) { throw new UnsupportedOperationException("Not supported yet."); } @Override - public V executeQuery(String sql, BiConsumer consumer, Function handler) { + public V nativeQuery(String sql, BiConsumer consumer, Function handler) { throw new UnsupportedOperationException("Not supported yet."); } diff --git a/src/main/java/org/redkale/source/DataSqlSource.java b/src/main/java/org/redkale/source/DataSqlSource.java index 643ecf673..bb45a3bcc 100644 --- a/src/main/java/org/redkale/source/DataSqlSource.java +++ b/src/main/java/org/redkale/source/DataSqlSource.java @@ -19,19 +19,19 @@ import static org.redkale.source.DataResultSet.formatColumnValue; */ public interface DataSqlSource extends DataSource { - public int executeUpdate(String sql); + public int nativeUpdate(String sql); - public int[] executeUpdate(String... sqls); + public int[] nativeUpdate(String... sqls); //BiConsumer 参数1: connection, 参数2: statement - public V executeQuery(String sql, BiConsumer consumer, Function handler); + public V nativeQuery(String sql, BiConsumer consumer, Function handler); - default V executeQuery(String sql, Function handler) { - return executeQuery(sql, null, handler); + default V nativeQuery(String sql, Function handler) { + return nativeQuery(sql, null, handler); } - default V executeQueryOne(Class type, String sql) { - return executeQuery(sql, rset -> { + default V nativeQueryOne(Class type, String sql) { + return nativeQuery(sql, rset -> { if (!rset.next()) { return null; } @@ -42,8 +42,8 @@ public interface DataSqlSource extends DataSource { }); } - default List executeQueryList(Class type, String sql) { - return executeQuery(sql, rset -> { + default List nativeQueryList(Class type, String sql) { + return nativeQuery(sql, rset -> { if (type.isPrimitive() || type == byte[].class || type.getName().startsWith("java.")) { List list = new ArrayList<>(); while (rset.next()) { @@ -55,8 +55,8 @@ public interface DataSqlSource extends DataSource { }); } - default Map executeQueryMap(Class keyType, Class valType, String sql) { - return executeQuery(sql, rset -> { + default Map nativeQueryMap(Class keyType, Class valType, String sql) { + return nativeQuery(sql, rset -> { Map map = new LinkedHashMap(); while (rset.next()) { if (!rset.wasNull()) { @@ -67,11 +67,11 @@ public interface DataSqlSource extends DataSource { }); } - default Map executeQueryStrStrMap(String sql) { - return executeQueryMap(String.class, String.class, sql); + default Map nativeQueryStrStrMap(String sql) { + return nativeQueryMap(String.class, String.class, sql); } - default Map executeQueryIntStrMap(String sql) { - return executeQueryMap(Integer.class, String.class, sql); + default Map nativeQueryIntStrMap(String sql) { + return nativeQueryMap(Integer.class, String.class, sql); } }