HHH-18368 WRAP_ALL_PARAMETERS mode used for coalesce function

Author: VladoKuruc

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java

@@ -295,7 +295,7 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 			);
 		}
 		else {
-			functionFactory.coalesce( SqlAstNodeRenderingMode.INLINE_ALL_PARAMETERS );
+			functionFactory.coalesce( SqlAstNodeRenderingMode.WRAP_ALL_PARAMETERS );
 			functionFactory.locate_charindex();
 		}
 		functionContributions.getFunctionRegistry().register( "least", new CaseLeastGreatestEmulation( true ) );

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqlAstTranslator.java

@@ -174,12 +174,12 @@ protected boolean supportsRowValueConstructorSyntaxInQuantifiedPredicates() {
 
 	@Override
 	protected String getDual() {
-		return "(select 0 from systables where tabid=1)";
+		return "systables where tabid=1";
 	}
 
 	@Override
 	protected String getFromDualForSelectOnly() {
-		return " from " + getDual() + " dual";
+		return getDialect().getVersion().isBefore( 14) ? (" from " + getDual()) : "";
 	}
 
 	@Override

hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java

@@ -334,6 +334,7 @@ public abstract class AbstractSqlAstTranslator<T extends JdbcOperation> implemen
 	private JdbcParameter offsetParameter;
 	private JdbcParameter limitParameter;
 	private ForUpdateClause forUpdate;
+	private boolean wrappingStarted;
 
 	protected AbstractSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement statement) {
 		this.sessionFactory = sessionFactory;
@@ -7078,16 +7079,16 @@ protected final void renderParameterAsParameter(JdbcParameter jdbcParameter) {
 
 	protected void renderWrappedParameter(JdbcParameter jdbcParameter) {
 		clauseStack.push( Clause.SELECT );
-
+		this.wrappingStarted = true;
 		try {
 			appendSql( "(select " );
-
-			render( jdbcParameter, SqlAstNodeRenderingMode.DEFAULT );
+			renderCasted( jdbcParameter );
 			appendSql( getFromDualForSelectOnly() );
 			appendSql( ')' );
 		}
 		finally {
 			clauseStack.pop();
+			this.wrappingStarted = false;
 		}
 	}
 
@@ -7106,7 +7107,7 @@ protected void renderParameterAsParameter(int position, JdbcParameter jdbcParame
 	@Override
 	public void render(SqlAstNode sqlAstNode, SqlAstNodeRenderingMode renderingMode) {
 		SqlAstNodeRenderingMode original = this.parameterRenderingMode;
-		if ( original != SqlAstNodeRenderingMode.INLINE_ALL_PARAMETERS && original != SqlAstNodeRenderingMode.WRAP_ALL_PARAMETERS ) {
+		if ( original != SqlAstNodeRenderingMode.INLINE_ALL_PARAMETERS && ( original != SqlAstNodeRenderingMode.WRAP_ALL_PARAMETERS || wrappingStarted ) ) {
 			this.parameterRenderingMode = renderingMode;
 		}
 		try {
@@ -7119,7 +7120,7 @@ public void render(SqlAstNode sqlAstNode, SqlAstNodeRenderingMode renderingMode)
 
 	protected void withParameterRenderingMode(SqlAstNodeRenderingMode renderingMode, Runnable runnable) {
 		SqlAstNodeRenderingMode original = this.parameterRenderingMode;
-		if ( original != SqlAstNodeRenderingMode.INLINE_ALL_PARAMETERS && original != SqlAstNodeRenderingMode.WRAP_ALL_PARAMETERS ) {
+		if ( original != SqlAstNodeRenderingMode.INLINE_ALL_PARAMETERS && ( original != SqlAstNodeRenderingMode.WRAP_ALL_PARAMETERS || wrappingStarted ) ) {
 			this.parameterRenderingMode = renderingMode;
 		}
 		try {
@@ -7303,7 +7304,7 @@ protected void visitAnsiCaseSearchedExpression(
 		appendSql( "case" );
 		final SqlAstNodeRenderingMode original = this.parameterRenderingMode;
 		for ( CaseSearchedExpression.WhenFragment whenFragment : caseSearchedExpression.getWhenFragments() ) {
-			if ( original != SqlAstNodeRenderingMode.INLINE_ALL_PARAMETERS && original != SqlAstNodeRenderingMode.WRAP_ALL_PARAMETERS ) {
+			if ( original != SqlAstNodeRenderingMode.INLINE_ALL_PARAMETERS && ( original != SqlAstNodeRenderingMode.WRAP_ALL_PARAMETERS || wrappingStarted ) ) {
 				this.parameterRenderingMode = SqlAstNodeRenderingMode.DEFAULT;
 			}
 			appendSql( " when " );
@@ -7331,7 +7332,7 @@ protected void visitDecodeCaseSearchedExpression(CaseSearchedExpression caseSear
 		for ( int i = 0; i < caseNumber; i++ ) {
 			final CaseSearchedExpression.WhenFragment whenFragment = whenFragments.get( i );
 			Predicate predicate = whenFragment.getPredicate();
-			if ( original != SqlAstNodeRenderingMode.INLINE_ALL_PARAMETERS && original != SqlAstNodeRenderingMode.WRAP_ALL_PARAMETERS ) {
+			if ( original != SqlAstNodeRenderingMode.INLINE_ALL_PARAMETERS && ( original != SqlAstNodeRenderingMode.WRAP_ALL_PARAMETERS || wrappingStarted ) ) {
 				this.parameterRenderingMode = SqlAstNodeRenderingMode.DEFAULT;
 			}
 			if ( i != 0 ) {
@@ -7378,12 +7379,12 @@ protected void visitAnsiCaseSimpleExpression(
 			Consumer<Expression> resultRenderer) {
 		appendSql( "case " );
 		final SqlAstNodeRenderingMode original = this.parameterRenderingMode;
-		if ( original != SqlAstNodeRenderingMode.INLINE_ALL_PARAMETERS && original != SqlAstNodeRenderingMode.WRAP_ALL_PARAMETERS ) {
+		if ( original != SqlAstNodeRenderingMode.INLINE_ALL_PARAMETERS && ( original != SqlAstNodeRenderingMode.WRAP_ALL_PARAMETERS || wrappingStarted ) ) {
 			this.parameterRenderingMode = SqlAstNodeRenderingMode.DEFAULT;
 		}
 		caseSimpleExpression.getFixture().accept( this );
 		for ( CaseSimpleExpression.WhenFragment whenFragment : caseSimpleExpression.getWhenFragments() ) {
-			if ( original != SqlAstNodeRenderingMode.INLINE_ALL_PARAMETERS && original != SqlAstNodeRenderingMode.WRAP_ALL_PARAMETERS ) {
+			if ( original != SqlAstNodeRenderingMode.INLINE_ALL_PARAMETERS && ( original != SqlAstNodeRenderingMode.WRAP_ALL_PARAMETERS || wrappingStarted ) ) {
 				this.parameterRenderingMode = SqlAstNodeRenderingMode.DEFAULT;
 			}
 			appendSql( " when " );