Fix DB2 10.5 testsuite issues

hibernate · Jul 25, 2023 · e83008e · e83008e
1 parent b0ad374
commit e83008e
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 5 deletions.
diff --git a/...ity-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java b/...ity-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java
@@ -420,7 +420,7 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 						break;
 				}
 			}
-			renderComparisonEmulateDecode( lhs, operator, rhs );
+			renderComparisonEmulateDecode( lhs, operator, rhs, SqlAstNodeRenderingMode.NO_UNTYPED );
 		}
 	}
 

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2Dialect.java
@@ -862,7 +862,7 @@ public SqmMultiTableInsertStrategy getFallbackSqmInsertStrategy(
 
 	@Override
 	public boolean supportsIsTrue() {
-		return true;
+		return getDB2Version().isSameOrAfter( 11 );
 	}
 
 	@Override

diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java
@@ -444,7 +444,7 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
 						break;
 				}
 			}
-			renderComparisonEmulateDecode( lhs, operator, rhs );
+			renderComparisonEmulateDecode( lhs, operator, rhs, SqlAstNodeRenderingMode.NO_UNTYPED );
 		}
 	}
 

diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
@@ -3625,17 +3625,25 @@ protected void renderComparisonDistinctOperator(Expression lhs, ComparisonOperat
 	}
 
 	protected void renderComparisonEmulateDecode(Expression lhs, ComparisonOperator operator, Expression rhs) {
+		renderComparisonEmulateDecode( lhs, operator, rhs, SqlAstNodeRenderingMode.DEFAULT );
+	}
+
+	protected void renderComparisonEmulateDecode(
+			Expression lhs,
+			ComparisonOperator operator,
+			Expression rhs,
+			SqlAstNodeRenderingMode firstArgRenderingMode) {
 		switch ( operator ) {
 			case DISTINCT_FROM:
 				appendSql( "decode(" );
-				lhs.accept( this );
+				render( lhs, firstArgRenderingMode );
 				appendSql( ',' );
 				rhs.accept( this );
 				appendSql( ",0,1)=1" );
 				break;
 			case NOT_DISTINCT_FROM:
 				appendSql( "decode(" );
-				lhs.accept( this );
+				render( lhs, firstArgRenderingMode );
 				appendSql( ',' );
 				rhs.accept( this );
 				appendSql( ",0,1)=0" );