fix: timeout

devezhao · Apr 6, 2023 · d11432b · d11432b
1 parent a76718f
commit d11432b
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 5 deletions.
diff --git a/pom.xml b/pom.xml
@@ -5,7 +5,7 @@
 
 	<groupId>cn.devezhao</groupId>
 	<artifactId>persist4j</artifactId>
-	<version>1.6.2</version>
+	<version>1.6.3</version>
 	<packaging>jar</packaging>
 
 	<name>persist4j</name>

diff --git a/src/main/java/cn/devezhao/persist4j/engine/JdbcSupport.java b/src/main/java/cn/devezhao/persist4j/engine/JdbcSupport.java
@@ -78,9 +78,9 @@ public Object doInParameters(PreparedStatement pstmt) {
 		int[] rowsAffected;
 		try {
 			stmt = connect.createStatement();
-
+			stmt.setQueryTimeout(getTimeout());
+
 			if (SqlHelper.supportsBatchUpdates(connect)) {
-				stmt.setQueryTimeout(TIMEOUT_DEFAULT * 3);
 				for (String sql : sqls) {
 					if (LOG.isDebugEnabled()) {
 						LOG.debug("add sql to batch: " + sql);
@@ -90,7 +90,6 @@ public Object doInParameters(PreparedStatement pstmt) {
 				}
 				rowsAffected = stmt.executeBatch();
 			} else {
-				stmt.setQueryTimeout(TIMEOUT_DEFAULT);
 				rowsAffected = new int[sqls.length];
 				for (int i = 0; i < sqls.length; i++) {
 					String crtSql = sqls[i];
@@ -129,7 +128,7 @@ protected ResultSet nativeQuery(String sql) throws SQLException, DataAccessExcep
 
 		try {
 			stmt = connect.createStatement();
-			stmt.setQueryTimeout(180);
+			stmt.setQueryTimeout(getTimeout());
 			if (LOG.isDebugEnabled()) {
 				LOG.debug("exec query: " + sql);
 			}