feat: BasicDAOHelper has method to set query timeout

Author: fugerit79

CHANGELOG.md

@@ -7,6 +7,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+- BasicDAOHelper has method to set query timeout
+
 ## [8.7.1] - 2025-10-31
 
 ### Changed

fj-core/src/main/java/org/fugerit/java/core/db/daogen/BasicDAOHelper.java

@@ -32,7 +32,7 @@
  */
 @Slf4j
 public class BasicDAOHelper<T> implements LogObject {
-	
+
 	@Override
 	public Logger getLogger() {
 		return log;
@@ -52,12 +52,19 @@ public static String fieldListToString( FieldList fl ) {
 		return buffer.toString();
 	}
 
-	private DAOContext daoContext; 
+	private DAOContext daoContext;
+
+	private Integer queryTimeout;
 
-	public BasicDAOHelper( DAOContext daoContext) {
-		this.daoContext =daoContext;
+	public BasicDAOHelper( DAOContext daoContext ) {
+		this( daoContext, null );
 	}
-	
+
+	public BasicDAOHelper(DAOContext daoContext, Integer queryTimeout) {
+		this.daoContext = daoContext;
+		this.queryTimeout = queryTimeout;
+	}
+
 	public FieldList newFieldList() {
 		return new FieldList( new FieldFactory() );
 	}
@@ -75,7 +82,13 @@ public T loadOneHelper(  SelectHelper query, RSExtractor<T> re ) throws DAOExcep
 	public void loadAllHelper( List<T> l, SelectHelper query, RSExtractor<T> re ) throws DAOException {
 		this.loadAllHelper( l, query.getQueryContent(), query.getFields(), re );
 	}
-	
+
+	private PreparedStatement prepareStatement( PreparedStatement ps ) throws SQLException {
+		if ( this.queryTimeout != null ) {
+			ps.setQueryTimeout( this.queryTimeout );
+		}
+		return ps;
+	}
 
 	public void loadAllHelper( List<T> l, String query, FieldList fields, RSExtractor<T> re ) throws DAOException {
 		long startTime = System.currentTimeMillis();
@@ -86,7 +99,7 @@ public void loadAllHelper( List<T> l, String query, FieldList fields, RSExtracto
 		log.debug( "queryId:'{}', loadAll RSExtractor   : '{}'", queryId, re);
 		Connection conn = this.daoContext.getConnection();
 		int i=0;
-		try ( PreparedStatement ps = conn.prepareStatement( query ) ) {
+		try ( PreparedStatement ps = this.prepareStatement( conn.prepareStatement( query ) ) ) {
 			DAOHelper.setAll( queryId, ps, fields , log );
 			long executeStart = System.currentTimeMillis();
 			try ( ResultSet rs = ps.executeQuery() ) {
@@ -108,7 +121,7 @@ public void loadAllHelper( List<T> l, String query, FieldList fields, RSExtracto
 	private int updateWorker( String queryId, FieldList fields, String query , long startTime) throws DAOException {
 		int res = 0;
 		Connection conn = this.daoContext.getConnection();
-		try ( PreparedStatement ps = conn.prepareStatement( query ) ) {
+		try ( PreparedStatement ps = this.prepareStatement( conn.prepareStatement( query ) ) ) {
 			DAOHelper.setAll( queryId, ps, fields , log );
 			long executeStart = System.currentTimeMillis();
 			res = ps.executeUpdate();

fj-core/src/test/java/test/org/fugerit/java/core/db/dao/daogen/TestSelectHelperUpper.java

@@ -17,7 +17,7 @@ protected void testQueryHelperIgnoreCase( String syntax ) {
 				stm.execute( "SET DATABASE SQL SYNTAX "+syntax+" TRUE" );
 			}
 			// SelectHelper setup
-			BasicDAOHelper<String> daoHelper = new BasicDAOHelper<>(context);
+			BasicDAOHelper<String> daoHelper = new BasicDAOHelper<>(context, 10);
 			SelectHelper selectHelper = daoHelper.newSelectHelper( "fugerit.address" );
 			// select helper is basically a query builder, it is possible to add functions, instead of the simple column name
 			String column = String.format( "UPPER(%s)" , COL_INFO );		// will add 'UPPER(INFO)'