edit

oneteme · May 17, 2024 · 536f592 · 536f592
1 parent a1c7ab6
commit 536f592
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 8 deletions.
diff --git a/src/main/java/org/usf/traceapi/core/PreparedStatementWrapper.java b/src/main/java/org/usf/traceapi/core/PreparedStatementWrapper.java
@@ -55,8 +55,15 @@ public ResultSetMetaData getMetaData() throws SQLException {
 		return tracer.resultSetMetadata(ps::getMetaData);
 	}
 
+	// Override StatementWrapper
+
+	@Override
+	public int[] executeBatch() throws SQLException {
+		return tracer.executeBatch(sql, st::executeBatch);
+	}
+
 	@Override
-	protected String baseSql() { //should not use addBatch(sql)
-		return sql;
+	public long[] executeLargeBatch() throws SQLException {
+		return tracer.executeLargeBatch(sql, st::executeLargeBatch);
 	}
 }
diff --git a/src/main/java/org/usf/traceapi/core/StatementWrapper.java b/src/main/java/org/usf/traceapi/core/StatementWrapper.java
@@ -74,7 +74,7 @@ public int executeUpdate(String sql, String[] columnNames) throws SQLException {
 
 	@Override
 	public int[] executeBatch() throws SQLException {
-		return tracer.executeBatch(baseSql(), st::executeBatch);
+		return tracer.executeBatch(null, st::executeBatch);
 	}
 
 	@Override
@@ -99,7 +99,7 @@ public long executeLargeUpdate(String sql, String[] columnNames) throws SQLExcep
 
 	@Override
 	public long[] executeLargeBatch() throws SQLException {
-		return tracer.executeLargeBatch(baseSql(), st::executeLargeBatch);
+		return tracer.executeLargeBatch(null, st::executeLargeBatch);
 	}
 
 	@Override
@@ -116,8 +116,4 @@ public boolean getMoreResults() throws SQLException {
 	public boolean getMoreResults(int current) throws SQLException {
 		return tracer.moreResults(this, ()-> st.getMoreResults(current));
 	}
-
-	protected String baseSql() {
-		return null; // used in PreparedStatement
-	}
 }