Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

HHH-12075 : SQLQuery.executeUpdate() ignores SQLQuery.setTimeout() 

(cherry picked from commit 712fb477e7)
This commit is contained in:
Gail Badner 2018-01-08 22:47:07 -08:00
parent 1ee2e9d1f5
commit 40bbc56063
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
hibernate-core/src/main/java/org/hibernate/engine/query/spi/NativeSQLQueryPlan.java
View File

@ -17,6 +17,7 @@ import org.hibernate.HibernateException;
import org.hibernate.QueryException; import org.hibernate.QueryException;
import org.hibernate.action.internal.BulkOperationCleanupAction; import org.hibernate.action.internal.BulkOperationCleanupAction;
import org.hibernate.engine.spi.QueryParameters; import org.hibernate.engine.spi.QueryParameters;
import org.hibernate.engine.spi.RowSelection;
import org.hibernate.engine.spi.SessionImplementor; import org.hibernate.engine.spi.SessionImplementor;
import org.hibernate.engine.spi.TypedValue; import org.hibernate.engine.spi.TypedValue;
import org.hibernate.event.spi.EventSource; import org.hibernate.event.spi.EventSource;
@ -181,6 +182,7 @@ public class NativeSQLQueryPlan implements Serializable {
int result = 0; int result = 0;
PreparedStatement ps; PreparedStatement ps;
RowSelection selection = queryParameters.getRowSelection();
try { try {
queryParameters.processFilters( this.customQuery.getSQL(), session ); queryParameters.processFilters( this.customQuery.getSQL(), session );
final String sql = queryParameters.getFilteredSQL(); final String sql = queryParameters.getFilteredSQL();
@ -191,6 +193,9 @@ public class NativeSQLQueryPlan implements Serializable {
int col = 1; int col = 1;
col += bindPositionalParameters( ps, queryParameters, col, session ); col += bindPositionalParameters( ps, queryParameters, col, session );
col += bindNamedParameters( ps, queryParameters.getNamedParameters(), col, session ); col += bindNamedParameters( ps, queryParameters.getNamedParameters(), col, session );
if ( selection != null && selection.getTimeout() != null ) {
ps.setQueryTimeout( selection.getTimeout() );
}
result = session.getJdbcCoordinator().getResultSetReturn().executeUpdate( ps ); result = session.getJdbcCoordinator().getResultSetReturn().executeUpdate( ps );
} }
finally { finally {