diff --git a/easysql-api/pom.xml b/easysql-api/pom.xml
index 0a02aa7..48e0424 100644
--- a/easysql-api/pom.xml
+++ b/easysql-api/pom.xml
@@ -5,7 +5,7 @@
cc.carm.lib
easysql-parent
- 0.2.1
+ 0.2.2-SNAPSHOT
4.0.0
diff --git a/easysql-api/src/main/java/cc/carm/lib/easysql/api/SQLAction.java b/easysql-api/src/main/java/cc/carm/lib/easysql/api/SQLAction.java
index 9049216..f764077 100644
--- a/easysql-api/src/main/java/cc/carm/lib/easysql/api/SQLAction.java
+++ b/easysql-api/src/main/java/cc/carm/lib/easysql/api/SQLAction.java
@@ -138,6 +138,7 @@ public interface SQLAction {
return (exception, action) -> {
getManager().getLogger().severe("Error when execute [" + action.getSQLContent() + "]");
getManager().getLogger().severe(exception.getLocalizedMessage());
+ exception.printStackTrace();
};
}
diff --git a/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateAction.java b/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateAction.java
index b585cf8..c79fe64 100644
--- a/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateAction.java
+++ b/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateAction.java
@@ -2,6 +2,10 @@ package cc.carm.lib.easysql.api.action;
import cc.carm.lib.easysql.api.SQLAction;
+import java.sql.SQLException;
+import java.util.List;
+import java.util.function.BiConsumer;
+
public interface SQLUpdateAction extends SQLAction {
/**
@@ -23,4 +27,6 @@ public interface SQLUpdateAction extends SQLAction {
return setKeyIndex(-1); // will return changed lines number
}
+
+
}
diff --git a/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateBatchAction.java b/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateBatchAction.java
index 3b92b1f..1296025 100644
--- a/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateBatchAction.java
+++ b/easysql-api/src/main/java/cc/carm/lib/easysql/api/action/SQLUpdateBatchAction.java
@@ -3,7 +3,9 @@ package cc.carm.lib.easysql.api.action;
import cc.carm.lib.easysql.api.SQLAction;
import org.jetbrains.annotations.NotNull;
+import java.sql.SQLException;
import java.util.List;
+import java.util.function.BiConsumer;
public interface SQLUpdateBatchAction extends SQLAction> {
@@ -15,4 +17,20 @@ public interface SQLUpdateBatchAction extends SQLAction> {
*/
SQLUpdateBatchAction addBatch(@NotNull String sql);
+ List getSQLContents();
+
+ @Override
+ default BiConsumer>> defaultExceptionHandler() {
+ return (exception, action) -> {
+ getManager().getLogger().severe("Error when execute SQLs : ");
+ int i = 1;
+ for (String content : getSQLContents()) {
+ getManager().getLogger().severe("#" + i + " [" + content + "]");
+ i++;
+ }
+ getManager().getLogger().severe(exception.getLocalizedMessage());
+ exception.printStackTrace();
+ };
+ }
+
}
diff --git a/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/ConditionalBuilder.java b/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/ConditionalBuilder.java
index 163f351..3743c02 100644
--- a/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/ConditionalBuilder.java
+++ b/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/ConditionalBuilder.java
@@ -28,7 +28,7 @@ public interface ConditionalBuilder extends SQLBuilder {
ConditionalBuilder addCondition(@NotNull String[] queryNames, @Nullable Object[] queryValues);
ConditionalBuilder addNotNullCondition(@NotNull String queryName);
-
+
default ConditionalBuilder addTimeCondition(@NotNull String queryName, long startMillis, long endMillis) {
return addTimeCondition(queryName,
startMillis > 0 ? new Date(startMillis) : null,
diff --git a/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/InsertBuilder.java b/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/InsertBuilder.java
index 61de664..46c0b5a 100644
--- a/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/InsertBuilder.java
+++ b/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/InsertBuilder.java
@@ -7,8 +7,6 @@ public interface InsertBuilder {
String getTableName();
- InsertBuilder setTableName(String tableName);
-
T setColumnNames(List columnNames);
default T setColumnNames(String... columnNames) {
diff --git a/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/ReplaceBuilder.java b/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/ReplaceBuilder.java
index 3e3d8d2..c01857e 100644
--- a/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/ReplaceBuilder.java
+++ b/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/ReplaceBuilder.java
@@ -7,8 +7,6 @@ public interface ReplaceBuilder {
String getTableName();
- ReplaceBuilder setTableName(String tableName);
-
T setColumnNames(List columnNames);
default T setColumnNames(String... columnNames) {
diff --git a/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/TableCreateBuilder.java b/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/TableCreateBuilder.java
index d630f54..4af1d34 100644
--- a/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/TableCreateBuilder.java
+++ b/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/TableCreateBuilder.java
@@ -8,8 +8,6 @@ public interface TableCreateBuilder extends SQLBuilder {
@NotNull String getTableName();
- TableCreateBuilder setTableName(@NotNull String tableName);
-
@NotNull String getTableSettings();
TableCreateBuilder setTableSettings(@NotNull String settings);
diff --git a/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/UpsertBuilder.java b/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/UpsertBuilder.java
index a2fcc43..cba0903 100644
--- a/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/UpsertBuilder.java
+++ b/easysql-api/src/main/java/cc/carm/lib/easysql/api/builder/UpsertBuilder.java
@@ -1,4 +1,9 @@
package cc.carm.lib.easysql.api.builder;
public interface UpsertBuilder {
+
+ String getTableName();
+
+ UpsertBuilder setColumnNames(String[] columnNames, String updateColumn);
+
}
diff --git a/easysql-beecp/pom.xml b/easysql-beecp/pom.xml
index c4ae389..a0358e5 100644
--- a/easysql-beecp/pom.xml
+++ b/easysql-beecp/pom.xml
@@ -5,7 +5,7 @@
easysql-parent
cc.carm.lib
- 0.2.1
+ 0.2.2-SNAPSHOT
4.0.0
diff --git a/easysql-demo/pom.xml b/easysql-demo/pom.xml
index bf659a4..f0d6b5d 100644
--- a/easysql-demo/pom.xml
+++ b/easysql-demo/pom.xml
@@ -5,7 +5,7 @@
easysql-parent
cc.carm.lib
- 0.2.1
+ 0.2.2-SNAPSHOT
4.0.0
diff --git a/easysql-hikaricp/pom.xml b/easysql-hikaricp/pom.xml
index c3ac0d1..eae8365 100644
--- a/easysql-hikaricp/pom.xml
+++ b/easysql-hikaricp/pom.xml
@@ -5,7 +5,7 @@
easysql-parent
cc.carm.lib
- 0.2.1
+ 0.2.2-SNAPSHOT
4.0.0
@@ -65,7 +65,7 @@
com.zaxxer
HikariCP
- 4.0.3
+ 5.0.0
compile
diff --git a/easysql-impl/pom.xml b/easysql-impl/pom.xml
index 8beb8e6..2ce1fde 100644
--- a/easysql-impl/pom.xml
+++ b/easysql-impl/pom.xml
@@ -5,7 +5,7 @@
easysql-parent
cc.carm.lib
- 0.2.1
+ 0.2.2-SNAPSHOT
4.0.0
diff --git a/easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLBatchUpdateActionImpl.java b/easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLBatchUpdateActionImpl.java
index 72bd52a..412361e 100644
--- a/easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLBatchUpdateActionImpl.java
+++ b/easysql-impl/src/main/java/cc/carm/lib/easysql/action/PreparedSQLBatchUpdateActionImpl.java
@@ -12,10 +12,9 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import java.util.function.Consumer;
import java.util.stream.Collectors;
-public class PreparedSQLBatchUpdateActionImpl extends SQLUpdateBatchActionImpl implements PreparedSQLUpdateBatchAction {
+public class PreparedSQLBatchUpdateActionImpl extends AbstractSQLAction> implements PreparedSQLUpdateBatchAction {
int keyIndex = -1;
List