diff --git a/src/main/java/org/redkale/source/AbstractDataSqlSource.java b/src/main/java/org/redkale/source/AbstractDataSqlSource.java index 1ef970a35..c11e6c868 100644 --- a/src/main/java/org/redkale/source/AbstractDataSqlSource.java +++ b/src/main/java/org/redkale/source/AbstractDataSqlSource.java @@ -666,17 +666,6 @@ public abstract class AbstractDataSqlSource extends AbstractDataSource implement return autoDDL; } - @Local - @Override - public abstract int nativeExecute(String sql); - - @Local - @Override - public abstract int[] nativeExecute(String... sqls); - - @Local - @Override - public abstract V nativeQuery(String sql, Function handler); //是否异步 protected abstract boolean isAsync(); diff --git a/src/main/java/org/redkale/source/DataJdbcSource.java b/src/main/java/org/redkale/source/DataJdbcSource.java index 75fcd9cc0..5f7a13bc4 100644 --- a/src/main/java/org/redkale/source/DataJdbcSource.java +++ b/src/main/java/org/redkale/source/DataJdbcSource.java @@ -2464,8 +2464,8 @@ public class DataJdbcSource extends AbstractDataSqlSource { */ @Local @Override - public int nativeExecute(String sql) { - return nativeExecute(new String[]{sql})[0]; + public int executeUpdate(String sql) { + return executeUpdate(new String[]{sql})[0]; } /** @@ -2478,7 +2478,7 @@ public class DataJdbcSource extends AbstractDataSqlSource { */ @Local @Override - public int[] nativeExecute(String... sqls) { + public int[] executeUpdate(String... sqls) { if (sqls.length == 0) { return new int[0]; } @@ -2521,7 +2521,7 @@ public class DataJdbcSource extends AbstractDataSqlSource { */ @Local @Override - public V nativeQuery(String sql, Function handler) { + public V executeQuery(String sql, Function handler) { final long s = System.currentTimeMillis(); final SourceConnection conn = readPool.pollConnection(); try { @@ -2547,17 +2547,17 @@ public class DataJdbcSource extends AbstractDataSqlSource { @Deprecated public int directExecute(String sql) { - return nativeExecute(sql); + return executeUpdate(sql); } @Deprecated public int[] directExecute(String... sqls) { - return nativeExecute(sqls); + return executeUpdate(sqls); } @Deprecated public V directQuery(String sql, Function handler) { - return nativeQuery(sql, handler); + return executeQuery(sql, handler); } public static DataResultSet createDataResultSet(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 b31372560..6e744330f 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 nativeExecute(String sql) { + public int executeUpdate(String sql) { throw new UnsupportedOperationException("Not supported yet."); } @Override - public int[] nativeExecute(String... sqls) { + public int[] executeUpdate(String... sqls) { throw new UnsupportedOperationException("Not supported yet."); } @Override - public V nativeQuery(String sql, Function handler) { + public V executeQuery(String sql, 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 90a7c75ba..0aaf422d9 100644 --- a/src/main/java/org/redkale/source/DataSqlSource.java +++ b/src/main/java/org/redkale/source/DataSqlSource.java @@ -17,10 +17,10 @@ import java.util.function.Function; */ public interface DataSqlSource extends DataSource { - public int nativeExecute(String sql); + public int executeUpdate(String sql); - public int[] nativeExecute(String... sqls); + public int[] executeUpdate(String... sqls); - public V nativeQuery(String sql, Function handler); + public V executeQuery(String sql, Function handler); }