audit calls to convert()

gavinking · gavinking · commit c38ab8bc8204 · 2025-06-29T15:07:58.000+02:00
ideally, such calls should always pass the SQL statement as a separate argument
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java
@@ -1948,7 +1948,8 @@ public Clob mergeClob(Clob original, Clob target, SharedSessionContractImplement
 					throw new HibernateException( "Unable to copy stream content", e );
 				}
 				catch (SQLException e ) {
-					throw session.getFactory().getJdbcServices().getSqlExceptionHelper().convert( e, "unable to merge CLOB data" );
+					throw session.getFactory().getJdbcServices().getSqlExceptionHelper()
+							.convert( e, "unable to merge CLOB data" );
 				}
 			}
 			else {
@@ -1971,7 +1972,8 @@ public NClob mergeNClob(NClob original, NClob target, SharedSessionContractImple
 					throw new HibernateException( "Unable to copy stream content", e );
 				}
 				catch (SQLException e ) {
-					throw session.getFactory().getJdbcServices().getSqlExceptionHelper().convert( e, "unable to merge NCLOB data" );
+					throw session.getFactory().getJdbcServices().getSqlExceptionHelper()
+							.convert( e, "unable to merge NCLOB data" );
 				}
 			}
 			else {
@@ -1997,7 +1999,8 @@ public Blob mergeBlob(Blob original, Blob target, SharedSessionContractImplement
 						: lobCreator.createBlob( original.getBinaryStream(), original.length() );
 			}
 			catch (SQLException e) {
-				throw jdbcServices.getSqlExceptionHelper().convert( e, "unable to merge BLOB data" );
+				throw jdbcServices.getSqlExceptionHelper()
+						.convert( e, "unable to merge BLOB data" );
 			}
 		}
 
@@ -2014,7 +2017,8 @@ public Clob mergeClob(Clob original, Clob target, SharedSessionContractImplement
 						: lobCreator.createClob( original.getCharacterStream(), original.length() );
 			}
 			catch (SQLException e) {
-				throw jdbcServices.getSqlExceptionHelper().convert( e, "unable to merge CLOB data" );
+				throw jdbcServices.getSqlExceptionHelper()
+						.convert( e, "unable to merge CLOB data" );
 			}
 		}
 
@@ -2031,7 +2035,8 @@ public NClob mergeNClob(NClob original, NClob target, SharedSessionContractImple
 						: lobCreator.createNClob( original.getCharacterStream(), original.length() );
 			}
 			catch (SQLException e) {
-				throw jdbcServices.getSqlExceptionHelper().convert( e, "unable to merge NCLOB data" );
+				throw jdbcServices.getSqlExceptionHelper()
+						.convert( e, "unable to merge NCLOB data" );
 			}
 		}
 	};
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/FallbackRefCursorSupport.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/FallbackRefCursorSupport.java
@@ -27,7 +27,8 @@ public void registerRefCursorParameter(CallableStatement statement, int position
 			jdbcServices.getDialect().registerResultSetOutParameter( statement, position );
 		}
 		catch (SQLException e) {
-			throw jdbcServices.getSqlExceptionHelper().convert( e, "Error asking dialect to register ref cursor parameter [" + position + "]" );
+			throw jdbcServices.getSqlExceptionHelper()
+					.convert( e, "Error asking dialect to register ref cursor parameter [" + position + "]" );
 		}
 	}
 
@@ -37,7 +38,8 @@ public void registerRefCursorParameter(CallableStatement statement, String name)
 			jdbcServices.getDialect().registerResultSetOutParameter( statement, name );
 		}
 		catch (SQLException e) {
-			throw jdbcServices.getSqlExceptionHelper().convert( e, "Error asking dialect to register ref cursor parameter [" + name + "]" );
+			throw jdbcServices.getSqlExceptionHelper()
+					.convert( e, "Error asking dialect to register ref cursor parameter [" + name + "]" );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/StandardRefCursorSupport.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/cursor/internal/StandardRefCursorSupport.java
@@ -36,7 +36,8 @@ public void registerRefCursorParameter(CallableStatement statement, int position
 			statement.registerOutParameter( position, refCursorTypeCode() );
 		}
 		catch (SQLException e) {
-			throw jdbcServices.getSqlExceptionHelper().convert( e, "Error registering REF_CURSOR parameter [" + position + "]" );
+			throw jdbcServices.getSqlExceptionHelper()
+					.convert( e, "Error registering REF_CURSOR parameter [" + position + "]" );
 		}
 	}
 
@@ -46,7 +47,8 @@ public void registerRefCursorParameter(CallableStatement statement, String name)
 			statement.registerOutParameter( name, refCursorTypeCode() );
 		}
 		catch (SQLException e) {
-			throw jdbcServices.getSqlExceptionHelper().convert( e, "Error registering REF_CURSOR parameter [" + name + "]" );
+			throw jdbcServices.getSqlExceptionHelper()
+					.convert( e, "Error registering REF_CURSOR parameter [" + name + "]" );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java b/hibernate-core/src/main/java/org/hibernate/engine/jdbc/internal/StatementPreparerImpl.java
@@ -71,7 +71,7 @@ public Statement createStatement() {
 			return statement;
 		}
 		catch ( SQLException e ) {
-			throw sqlExceptionHelper().convert( e, "could not create statement" );
+			throw sqlExceptionHelper().convert( e, "Could not create statement" );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcIsolationDelegate.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jdbc/internal/JdbcIsolationDelegate.java
@@ -86,11 +86,11 @@ public <T> T delegateWork(WorkExecutorVisitable<T> work, boolean transacted) thr
 				if ( e instanceof HibernateException ) {
 					throw (HibernateException) e;
 				}
-				else if ( e instanceof SQLException ) {
-					throw sqlExceptionHelper().convert( (SQLException) e, "error performing isolated work" );
+				else if ( e instanceof SQLException sqle ) {
+					throw sqlExceptionHelper().convert( sqle, "Error performing isolated work" );
 				}
 				else {
-					throw new HibernateException( "error performing isolated work", e );
+					throw new HibernateException( "Error performing isolated work", e );
 				}
 			}
 			finally {
@@ -111,7 +111,7 @@ else if ( e instanceof SQLException ) {
 			}
 		}
 		catch ( SQLException sqle ) {
-			throw sqlExceptionHelper().convert( sqle, "unable to obtain isolated JDBC connection" );
+			throw sqlExceptionHelper().convert( sqle, "Unable to obtain isolated JDBC connection" );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/DdlTransactionIsolatorJtaImpl.java b/hibernate-core/src/main/java/org/hibernate/resource/transaction/backend/jta/internal/DdlTransactionIsolatorJtaImpl.java
@@ -72,7 +72,8 @@ public Connection getIsolatedConnection(boolean autocommit) {
 				jdbcConnection = jdbcContext.getJdbcConnectionAccess().obtainConnection();
 			}
 			catch (SQLException e) {
-				throw jdbcContext.getSqlExceptionHelper().convert( e, "Unable to open JDBC Connection for DDL execution" );
+				throw jdbcContext.getSqlExceptionHelper()
+						.convert( e, "Unable to open JDBC Connection for DDL execution" );
 			}
 
 			try {
@@ -81,7 +82,8 @@ public Connection getIsolatedConnection(boolean autocommit) {
 				}
 			}
 			catch (SQLException e) {
-				throw jdbcContext.getSqlExceptionHelper().convert( e, "Unable to set JDBC Connection for DDL execution to autocommit" );
+				throw jdbcContext.getSqlExceptionHelper()
+						.convert( e, "Unable to set JDBC Connection for DDL execution to autocommit" );
 			}
 		}
 		return jdbcConnection;
@@ -94,7 +96,8 @@ public void release() {
 				jdbcContext.getJdbcConnectionAccess().releaseConnection( jdbcConnection );
 			}
 			catch (SQLException e) {
-				throw jdbcContext.getSqlExceptionHelper().convert( e, "Unable to release JDBC Connection used for DDL execution" );
+				throw jdbcContext.getSqlExceptionHelper()
+						.convert( e, "Unable to release JDBC Connection used for DDL execution" );
 			}
 		}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterExtractorImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterExtractorImpl.java
@@ -52,10 +52,8 @@ public T extractValue(
 			return ormType.extract( callableStatement, parameterPosition, session );
 		}
 		catch (SQLException e) {
-			throw session.getJdbcServices().getSqlExceptionHelper().convert(
-					e,
-					"Unable to extract OUT/INOUT parameter value"
-			);
+			throw session.getJdbcServices().getSqlExceptionHelper()
+					.convert( e, "Unable to extract OUT/INOUT parameter value" );
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterRegistrationImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/JdbcCallParameterRegistrationImpl.java
@@ -113,10 +113,8 @@ private void registerOutputParameter(
 			sqlTypeDescriptor.registerOutParameter( callableStatement, jdbcParameterPositionStart );
 		}
 		catch (SQLException e) {
-			throw session.getJdbcServices().getSqlExceptionHelper().convert(
-					e,
-					"Unable to register CallableStatement out parameter"
-			);
+			throw session.getJdbcServices().getSqlExceptionHelper()
+					.convert( e, "Unable to register CallableStatement OUT parameter" );
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java b/hibernate-core/src/main/java/org/hibernate/sql/exec/internal/StandardJdbcMutationExecutor.java
@@ -99,7 +99,7 @@ private static int handleException(
 			JdbcOperationQueryMutation jdbcMutation, SQLException sqle, JdbcServices jdbcServices, String finalSql) {
 		final JDBCException exception =
 				jdbcServices.getSqlExceptionHelper()
-						.convert( sqle, "JDBC exception executing SQL [" + finalSql + "]" );
+						.convert( sqle, "JDBC exception executing SQL", finalSql );
 		if ( exception instanceof ConstraintViolationException constraintViolationException
 			&& jdbcMutation instanceof JdbcOperationQueryInsert jdbcInsert ) {
 			if ( constraintViolationException.getKind() == ConstraintViolationException.ConstraintKind.UNIQUE ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractResultSetAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/AbstractResultSetAccess.java
@@ -34,10 +34,8 @@ protected ResultSetMetaData getMetaData() {
 				resultSetMetaData = getResultSet().getMetaData();
 			}
 			catch (SQLException e) {
-				throw persistenceContext.getJdbcServices().getSqlExceptionHelper().convert(
-						e,
-						"Unable to access ResultSetMetaData"
-				);
+				throw persistenceContext.getJdbcServices().getSqlExceptionHelper()
+						.convert( e, "Unable to access ResultSetMetaData" );
 			}
 		}
 
@@ -50,10 +48,8 @@ public int getColumnCount() {
 			return getMetaData().getColumnCount();
 		}
 		catch (SQLException e) {
-			throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper().convert(
-					e,
-					"Unable to access ResultSet column count"
-			);
+			throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper()
+					.convert( e, "Unable to access ResultSet column count" );
 		}
 	}
 
@@ -65,10 +61,8 @@ public int resolveColumnPosition(String columnName) {
 			);
 		}
 		catch (SQLException e) {
-			throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper().convert(
-					e,
-					"Unable to find column position by name: " + columnName
-			);
+			throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper()
+					.convert( e, "Unable to find column position by name: " + columnName );
 		}
 	}
 
@@ -80,10 +74,8 @@ public String resolveColumnName(int position) {
 					.extractColumnAlias( getMetaData(), position );
 		}
 		catch (SQLException e) {
-			throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper().convert(
-					e,
-					"Unable to find column name by position"
-			);
+			throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper()
+					.convert( e, "Unable to find column name by position" );
 		}
 	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/DeferredResultSetAccess.java
@@ -242,7 +242,7 @@ private void executeQuery() {
 
 		final SharedSessionContractImplementor session = executionContext.getSession();
 		try {
-			LOG.tracef( "Executing query to retrieve ResultSet : %s", finalSql );
+			LOG.tracef( "Executing query to retrieve ResultSet: %s", finalSql );
 			// prepare the query
 			preparedStatement = statementCreator.createStatement( executionContext, finalSql );
 
@@ -277,7 +277,7 @@ private void executeQuery() {
 				exception.addSuppressed( suppressed );
 			}
 			throw session.getJdbcServices().getSqlExceptionHelper()
-					.convert( exception, "JDBC exception executing SQL [" + finalSql + "]" );
+					.convert( exception, "JDBC exception executing SQL", finalSql );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesResultSetImpl.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/JdbcValuesResultSetImpl.java
@@ -309,10 +309,9 @@ private boolean advance(final boolean hasResult) {
 	}
 
 	private ExecutionException makeExecutionException(String message, SQLException cause) {
-		final JDBCException jdbcException = executionContext.getSession().getJdbcServices().getSqlExceptionHelper().convert(
-				cause,
-				message
-		);
+		final JDBCException jdbcException =
+				executionContext.getSession().getJdbcServices().getSqlExceptionHelper()
+						.convert( cause, message );
 		if ( jdbcException instanceof QueryTimeoutException
 				|| jdbcException instanceof DataException
 				|| jdbcException instanceof LockTimeoutException ) {
@@ -381,19 +380,18 @@ public Object getCurrentRowValue(int valueIndex) {
 		if ( !initializedIndexes.get( valueIndex ) ) {
 			initializedIndexes.set( valueIndex );
 			final SqlSelection sqlSelection = sqlSelections[valueIndex];
+			final int index = sqlSelection.getJdbcResultSetIndex();
 			try {
 				currentRowJdbcValues[valueIndex] = sqlSelection.getJdbcValueExtractor().extract(
 						resultSet,
-						sqlSelection.getJdbcResultSetIndex(),
+						index,
 						executionContext.getSession()
 				);
 			}
 			catch ( SQLException e ) {
 				// do not want to wrap in ExecutionException here
-				throw executionContext.getSession().getJdbcServices().getSqlExceptionHelper().convert(
-						e,
-						"Could not extract column [" + sqlSelection.getJdbcResultSetIndex() + "] from JDBC ResultSet"
-				);
+				throw executionContext.getSession().getJdbcServices().getSqlExceptionHelper()
+						.convert( e, "Could not extract column [" + index + "] from JDBC ResultSet" );
 			}
 		}
 		return currentRowJdbcValues[valueIndex];
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/ResultSetAccess.java b/hibernate-core/src/main/java/org/hibernate/sql/results/jdbc/internal/ResultSetAccess.java
@@ -43,10 +43,8 @@ default int getColumnCount() {
 			return getResultSet().getMetaData().getColumnCount();
 		}
 		catch (SQLException e) {
-			throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper().convert(
-					e,
-					"Unable to access ResultSet column count"
-			);
+			throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper()
+					.convert( e, "Unable to access ResultSet column count" );
 		}
 	}
 
@@ -55,10 +53,8 @@ default int resolveColumnPosition(String columnName) {
 			return getResultSet().findColumn( columnName );
 		}
 		catch (SQLException e) {
-			throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper().convert(
-					e,
-					"Unable to find column position by name"
-			);
+			throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper()
+					.convert( e, "Unable to find column position by name" );
 		}
 	}
 
@@ -70,10 +66,8 @@ default String resolveColumnName(int position) {
 					.extractColumnAlias( getResultSet().getMetaData(), position );
 		}
 		catch (SQLException e) {
-			throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper().convert(
-					e,
-					"Unable to find column name by position"
-			);
+			throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper()
+					.convert( e, "Unable to find column name by position" );
 		}
 	}
 
@@ -153,10 +147,8 @@ public Dialect getDialect() {
 			return typeConfiguration.getBasicTypeRegistry().resolve( javaType, jdbcType );
 		}
 		catch (SQLException e) {
-			throw jdbcServices.getSqlExceptionHelper().convert(
-					e,
-					"Unable to determine JDBC type code for ResultSet position " + position
-			);
+			throw jdbcServices.getSqlExceptionHelper()
+					.convert( e, "Unable to determine JDBC type code for ResultSet position " + position );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ExtractionContextImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/extract/internal/ExtractionContextImpl.java
@@ -63,7 +63,8 @@ public Connection getJdbcConnection() {
 				jdbcConnection = jdbcConnectionAccess.obtainConnection();
 			}
 			catch (SQLException e) {
-				throw jdbcEnvironment.getSqlExceptionHelper().convert( e, "Unable to obtain JDBC Connection" );
+				throw jdbcEnvironment.getSqlExceptionHelper()
+						.convert( e, "Unable to obtain JDBC Connection" );
 			}
 		}
 		return jdbcConnection;
@@ -76,7 +77,8 @@ public DatabaseMetaData getJdbcDatabaseMetaData() {
 				jdbcDatabaseMetaData = getJdbcConnection().getMetaData();
 			}
 			catch (SQLException e) {
-				throw jdbcEnvironment.getSqlExceptionHelper().convert( e, "Unable to obtain JDBC DatabaseMetaData" );
+				throw jdbcEnvironment.getSqlExceptionHelper()
+						.convert( e, "Unable to obtain JDBC DatabaseMetaData" );
 			}
 		}
 		return jdbcDatabaseMetaData;
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/Helper.java
@@ -184,7 +184,8 @@ public static DatabaseInformation buildDatabaseInformation(
 			);
 		}
 		catch (SQLException e) {
-			throw jdbcEnvironment.getSqlExceptionHelper().convert( e, "Unable to build DatabaseInformation" );
+			throw jdbcEnvironment.getSqlExceptionHelper()
+					.convert( e, "Unable to build DatabaseInformation" );
 		}
 	}
 
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToDatabase.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/GenerationTargetToDatabase.java
@@ -111,7 +111,8 @@ private Statement jdbcStatement() {
 				jdbcStatement = getIsolatedConnection().createStatement();
 			}
 			catch (SQLException e) {
-				throw getSqlExceptionHelper().convert( e, "Unable to create JDBC Statement for DDL execution" );
+				throw getSqlExceptionHelper()
+						.convert( e, "Unable to create JDBC Statement for DDL execution" );
 			}
 		}
 
@@ -126,7 +127,8 @@ public void release() {
 				jdbcStatement = null;
 			}
 			catch (SQLException e) {
-				throw getSqlExceptionHelper().convert( e, "Unable to close JDBC Statement after DDL execution" );
+				throw getSqlExceptionHelper()
+						.convert( e, "Unable to close JDBC Statement after DDL execution" );
 			}
 		}
 		if ( releaseAfterUse ) {
diff --git a/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ImprovedExtractionContextImpl.java b/hibernate-core/src/main/java/org/hibernate/tool/schema/internal/exec/ImprovedExtractionContextImpl.java

Original file line number	Diff line number	Diff line change
`@@ -1948,7 +1948,8 @@ public Clob mergeClob(Clob original, Clob target, SharedSessionContractImplement`
`1948`	`1948`	`throw new HibernateException( "Unable to copy stream content", e );`
`1949`	`1949`	`}`
`1950`	`1950`	`catch (SQLException e ) {`
`1951`		`- throw session.getFactory().getJdbcServices().getSqlExceptionHelper().convert( e, "unable to merge CLOB data" );`
	`1951`	`+ throw session.getFactory().getJdbcServices().getSqlExceptionHelper()`
	`1952`	`+ .convert( e, "unable to merge CLOB data" );`
`1952`	`1953`	`}`
`1953`	`1954`	`}`
`1954`	`1955`	`else {`
`@@ -1971,7 +1972,8 @@ public NClob mergeNClob(NClob original, NClob target, SharedSessionContractImple`
`1971`	`1972`	`throw new HibernateException( "Unable to copy stream content", e );`
`1972`	`1973`	`}`
`1973`	`1974`	`catch (SQLException e ) {`
`1974`		`- throw session.getFactory().getJdbcServices().getSqlExceptionHelper().convert( e, "unable to merge NCLOB data" );`
	`1975`	`+ throw session.getFactory().getJdbcServices().getSqlExceptionHelper()`
	`1976`	`+ .convert( e, "unable to merge NCLOB data" );`
`1975`	`1977`	`}`
`1976`	`1978`	`}`
`1977`	`1979`	`else {`
`@@ -1997,7 +1999,8 @@ public Blob mergeBlob(Blob original, Blob target, SharedSessionContractImplement`
`1997`	`1999`	`: lobCreator.createBlob( original.getBinaryStream(), original.length() );`
`1998`	`2000`	`}`
`1999`	`2001`	`catch (SQLException e) {`
`2000`		`- throw jdbcServices.getSqlExceptionHelper().convert( e, "unable to merge BLOB data" );`
	`2002`	`+ throw jdbcServices.getSqlExceptionHelper()`
	`2003`	`+ .convert( e, "unable to merge BLOB data" );`
`2001`	`2004`	`}`
`2002`	`2005`	`}`
`2003`	`2006`
`@@ -2014,7 +2017,8 @@ public Clob mergeClob(Clob original, Clob target, SharedSessionContractImplement`
`2014`	`2017`	`: lobCreator.createClob( original.getCharacterStream(), original.length() );`
`2015`	`2018`	`}`
`2016`	`2019`	`catch (SQLException e) {`
`2017`		`- throw jdbcServices.getSqlExceptionHelper().convert( e, "unable to merge CLOB data" );`
	`2020`	`+ throw jdbcServices.getSqlExceptionHelper()`
	`2021`	`+ .convert( e, "unable to merge CLOB data" );`
`2018`	`2022`	`}`
`2019`	`2023`	`}`
`2020`	`2024`
`@@ -2031,7 +2035,8 @@ public NClob mergeNClob(NClob original, NClob target, SharedSessionContractImple`
`2031`	`2035`	`: lobCreator.createNClob( original.getCharacterStream(), original.length() );`
`2032`	`2036`	`}`
`2033`	`2037`	`catch (SQLException e) {`
`2034`		`- throw jdbcServices.getSqlExceptionHelper().convert( e, "unable to merge NCLOB data" );`
	`2038`	`+ throw jdbcServices.getSqlExceptionHelper()`
	`2039`	`+ .convert( e, "unable to merge NCLOB data" );`
`2035`	`2040`	`}`
`2036`	`2041`	`}`
`2037`	`2042`	`};`
Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,8 @@ public void registerRefCursorParameter(CallableStatement statement, int position`
`27`	`27`	`jdbcServices.getDialect().registerResultSetOutParameter( statement, position );`
`28`	`28`	`}`
`29`	`29`	`catch (SQLException e) {`
`30`		`- throw jdbcServices.getSqlExceptionHelper().convert( e, "Error asking dialect to register ref cursor parameter [" + position + "]" );`
	`30`	`+ throw jdbcServices.getSqlExceptionHelper()`
	`31`	`+ .convert( e, "Error asking dialect to register ref cursor parameter [" + position + "]" );`
`31`	`32`	`}`
`32`	`33`	`}`
`33`	`34`
`@@ -37,7 +38,8 @@ public void registerRefCursorParameter(CallableStatement statement, String name)`
`37`	`38`	`jdbcServices.getDialect().registerResultSetOutParameter( statement, name );`
`38`	`39`	`}`
`39`	`40`	`catch (SQLException e) {`
`40`		`- throw jdbcServices.getSqlExceptionHelper().convert( e, "Error asking dialect to register ref cursor parameter [" + name + "]" );`
	`41`	`+ throw jdbcServices.getSqlExceptionHelper()`
	`42`	`+ .convert( e, "Error asking dialect to register ref cursor parameter [" + name + "]" );`
`41`	`43`	`}`
`42`	`44`	`}`
`43`	`45`
Original file line number	Diff line number	Diff line change
`@@ -36,7 +36,8 @@ public void registerRefCursorParameter(CallableStatement statement, int position`
`36`	`36`	`statement.registerOutParameter( position, refCursorTypeCode() );`
`37`	`37`	`}`
`38`	`38`	`catch (SQLException e) {`
`39`		`- throw jdbcServices.getSqlExceptionHelper().convert( e, "Error registering REF_CURSOR parameter [" + position + "]" );`
	`39`	`+ throw jdbcServices.getSqlExceptionHelper()`
	`40`	`+ .convert( e, "Error registering REF_CURSOR parameter [" + position + "]" );`
`40`	`41`	`}`
`41`	`42`	`}`
`42`	`43`
`@@ -46,7 +47,8 @@ public void registerRefCursorParameter(CallableStatement statement, String name)`
`46`	`47`	`statement.registerOutParameter( name, refCursorTypeCode() );`
`47`	`48`	`}`
`48`	`49`	`catch (SQLException e) {`
`49`		`- throw jdbcServices.getSqlExceptionHelper().convert( e, "Error registering REF_CURSOR parameter [" + name + "]" );`
	`50`	`+ throw jdbcServices.getSqlExceptionHelper()`
	`51`	`+ .convert( e, "Error registering REF_CURSOR parameter [" + name + "]" );`
`50`	`52`	`}`
`51`	`53`	`}`
`52`	`54`
Original file line number	Diff line number	Diff line change
`@@ -71,7 +71,7 @@ public Statement createStatement() {`
`71`	`71`	`return statement;`
`72`	`72`	`}`
`73`	`73`	`catch ( SQLException e ) {`
`74`		`- throw sqlExceptionHelper().convert( e, "could not create statement" );`
	`74`	`+ throw sqlExceptionHelper().convert( e, "Could not create statement" );`
`75`	`75`	`}`
`76`	`76`	`}`
`77`	`77`
Original file line number	Diff line number	Diff line change
`@@ -86,11 +86,11 @@ public <T> T delegateWork(WorkExecutorVisitable<T> work, boolean transacted) thr`
`86`	`86`	`if ( e instanceof HibernateException ) {`
`87`	`87`	`throw (HibernateException) e;`
`88`	`88`	`}`
`89`		`- else if ( e instanceof SQLException ) {`
`90`		`- throw sqlExceptionHelper().convert( (SQLException) e, "error performing isolated work" );`
	`89`	`+ else if ( e instanceof SQLException sqle ) {`
	`90`	`+ throw sqlExceptionHelper().convert( sqle, "Error performing isolated work" );`
`91`	`91`	`}`
`92`	`92`	`else {`
`93`		`- throw new HibernateException( "error performing isolated work", e );`
	`93`	`+ throw new HibernateException( "Error performing isolated work", e );`
`94`	`94`	`}`
`95`	`95`	`}`
`96`	`96`	`finally {`
`@@ -111,7 +111,7 @@ else if ( e instanceof SQLException ) {`
`111`	`111`	`}`
`112`	`112`	`}`
`113`	`113`	`catch ( SQLException sqle ) {`
`114`		`- throw sqlExceptionHelper().convert( sqle, "unable to obtain isolated JDBC connection" );`
	`114`	`+ throw sqlExceptionHelper().convert( sqle, "Unable to obtain isolated JDBC connection" );`
`115`	`115`	`}`
`116`	`116`	`}`
`117`	`117`
Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,8 @@ public Connection getIsolatedConnection(boolean autocommit) {`
`72`	`72`	`jdbcConnection = jdbcContext.getJdbcConnectionAccess().obtainConnection();`
`73`	`73`	`}`
`74`	`74`	`catch (SQLException e) {`
`75`		`- throw jdbcContext.getSqlExceptionHelper().convert( e, "Unable to open JDBC Connection for DDL execution" );`
	`75`	`+ throw jdbcContext.getSqlExceptionHelper()`
	`76`	`+ .convert( e, "Unable to open JDBC Connection for DDL execution" );`
`76`	`77`	`}`
`77`	`78`
`78`	`79`	`try {`
`@@ -81,7 +82,8 @@ public Connection getIsolatedConnection(boolean autocommit) {`
`81`	`82`	`}`
`82`	`83`	`}`
`83`	`84`	`catch (SQLException e) {`
`84`		`- throw jdbcContext.getSqlExceptionHelper().convert( e, "Unable to set JDBC Connection for DDL execution to autocommit" );`
	`85`	`+ throw jdbcContext.getSqlExceptionHelper()`
	`86`	`+ .convert( e, "Unable to set JDBC Connection for DDL execution to autocommit" );`
`85`	`87`	`}`
`86`	`88`	`}`
`87`	`89`	`return jdbcConnection;`
`@@ -94,7 +96,8 @@ public void release() {`
`94`	`96`	`jdbcContext.getJdbcConnectionAccess().releaseConnection( jdbcConnection );`
`95`	`97`	`}`
`96`	`98`	`catch (SQLException e) {`
`97`		`- throw jdbcContext.getSqlExceptionHelper().convert( e, "Unable to release JDBC Connection used for DDL execution" );`
	`99`	`+ throw jdbcContext.getSqlExceptionHelper()`
	`100`	`+ .convert( e, "Unable to release JDBC Connection used for DDL execution" );`
`98`	`101`	`}`
`99`	`102`	`}`
`100`	`103`
Original file line number	Diff line number	Diff line change
`@@ -52,10 +52,8 @@ public T extractValue(`
`52`	`52`	`return ormType.extract( callableStatement, parameterPosition, session );`
`53`	`53`	`}`
`54`	`54`	`catch (SQLException e) {`
`55`		`- throw session.getJdbcServices().getSqlExceptionHelper().convert(`
`56`		`- e,`
`57`		`- "Unable to extract OUT/INOUT parameter value"`
`58`		`- );`
	`55`	`+ throw session.getJdbcServices().getSqlExceptionHelper()`
	`56`	`+ .convert( e, "Unable to extract OUT/INOUT parameter value" );`
`59`	`57`	`}`
`60`	`58`	`}`
`61`	`59`	`}`
Original file line number	Diff line number	Diff line change
`@@ -113,10 +113,8 @@ private void registerOutputParameter(`
`113`	`113`	`sqlTypeDescriptor.registerOutParameter( callableStatement, jdbcParameterPositionStart );`
`114`	`114`	`}`
`115`	`115`	`catch (SQLException e) {`
`116`		`- throw session.getJdbcServices().getSqlExceptionHelper().convert(`
`117`		`- e,`
`118`		`- "Unable to register CallableStatement out parameter"`
`119`		`- );`
	`116`	`+ throw session.getJdbcServices().getSqlExceptionHelper()`
	`117`	`+ .convert( e, "Unable to register CallableStatement OUT parameter" );`
`120`	`118`	`}`
`121`	`119`	`}`
`122`	`120`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,10 +34,8 @@ protected ResultSetMetaData getMetaData() {`
`34`	`34`	`resultSetMetaData = getResultSet().getMetaData();`
`35`	`35`	`}`
`36`	`36`	`catch (SQLException e) {`
`37`		`- throw persistenceContext.getJdbcServices().getSqlExceptionHelper().convert(`
`38`		`- e,`
`39`		`- "Unable to access ResultSetMetaData"`
`40`		`- );`
	`37`	`+ throw persistenceContext.getJdbcServices().getSqlExceptionHelper()`
	`38`	`+ .convert( e, "Unable to access ResultSetMetaData" );`
`41`	`39`	`}`
`42`	`40`	`}`
`43`	`41`
`@@ -50,10 +48,8 @@ public int getColumnCount() {`
`50`	`48`	`return getMetaData().getColumnCount();`
`51`	`49`	`}`
`52`	`50`	`catch (SQLException e) {`
`53`		`- throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper().convert(`
`54`		`- e,`
`55`		`- "Unable to access ResultSet column count"`
`56`		`- );`
	`51`	`+ throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper()`
	`52`	`+ .convert( e, "Unable to access ResultSet column count" );`
`57`	`53`	`}`
`58`	`54`	`}`
`59`	`55`
`@@ -65,10 +61,8 @@ public int resolveColumnPosition(String columnName) {`
`65`	`61`	`);`
`66`	`62`	`}`
`67`	`63`	`catch (SQLException e) {`
`68`		`- throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper().convert(`
`69`		`- e,`
`70`		`- "Unable to find column position by name: " + columnName`
`71`		`- );`
	`64`	`+ throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper()`
	`65`	`+ .convert( e, "Unable to find column position by name: " + columnName );`
`72`	`66`	`}`
`73`	`67`	`}`
`74`	`68`
`@@ -80,10 +74,8 @@ public String resolveColumnName(int position) {`
`80`	`74`	`.extractColumnAlias( getMetaData(), position );`
`81`	`75`	`}`
`82`	`76`	`catch (SQLException e) {`
`83`		`- throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper().convert(`
`84`		`- e,`
`85`		`- "Unable to find column name by position"`
`86`		`- );`
	`77`	`+ throw getFactory().getJdbcServices().getJdbcEnvironment().getSqlExceptionHelper()`
	`78`	`+ .convert( e, "Unable to find column name by position" );`
`87`	`79`	`}`
`88`	`80`	`}`
`89`	`81`	`}`