HHH-16589 Limit in clause padding to Dialect.getInExpressionCountLimi…

…t and fix negated in predicate splitting
hibernate · Jun 20, 2023 · 1cc94c7 · 1cc94c7
1 parent 5695536
commit 1cc94c7
Showing 1 changed file with 30 additions and 10 deletions.
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
@@ -6839,13 +6839,6 @@ else if ( !supportsRowValueConstructorSyntaxInInList() ) {
 			}
 		}
 
-		inListPredicate.getTestExpression().accept( this );
-		if ( inListPredicate.isNegated() ) {
-			appendSql( " not" );
-		}
-		appendSql( " in (" );
-		String separator = NO_SEPARATOR;
-
 		int bindValueCount = listExpressions.size();
 		int bindValueMaxCount = bindValueCount;
 
@@ -6881,6 +6874,19 @@ else if ( bindValueCount < bindValuePaddingCount ) {
 			}
 		}
 
+		final boolean parenthesis = !inListPredicate.isNegated()
+				&& inExprLimit != 0 && listExpressions.size() > inExprLimit;
+		if ( parenthesis ) {
+			appendSql( OPEN_PARENTHESIS );
+		}
+
+		inListPredicate.getTestExpression().accept( this );
+		if ( inListPredicate.isNegated() ) {
+			appendSql( " not" );
+		}
+		appendSql( " in (" );
+		String separator = NO_SEPARATOR;
+
 		final Iterator<Expression> iterator = listExpressions.iterator();
 		int itemNumber = 0;
 		while ( iterator.hasNext() && ( inExprLimit == 0 || itemNumber < inExprLimit ) ) {
@@ -6904,11 +6910,15 @@ else if ( bindValueCount < bindValuePaddingCount ) {
 
 		if ( inExprLimit > 0 && bindValueCount > inExprLimit ) {
 			do {
-				append( ") or " );
-				inListPredicate.getTestExpression().accept( this );
 				if ( inListPredicate.isNegated() ) {
+					append( ") and " );
+					inListPredicate.getTestExpression().accept( this );
 					appendSql( " not" );
 				}
+				else {
+					append( ") or " );
+					inListPredicate.getTestExpression().accept( this );
+				}
 				appendSql( " in (" );
 				separator = NO_SEPARATOR;
 				itemNumber = 0;
@@ -6924,13 +6934,23 @@ else if ( bindValueCount < bindValuePaddingCount ) {
 
 		if ( inClauseParameterPaddingEnabled ) {
 			final Expression lastExpression = itemAccessor.apply( listExpressions.get( listExpressions.size() - 1 ) );
-			for ( ; itemNumber < bindValueMaxCount; itemNumber++ ) {
+			final int end;
+			if ( inExprLimit > 0 ) {
+				end = Math.min( bindValueMaxCount, inExprLimit );
+			}
+			else {
+				end = bindValueMaxCount;
+			}
+			for ( ; itemNumber < end; itemNumber++ ) {
 				appendSql( separator );
 				lastExpression.accept( this );
 				separator = COMMA_SEPARATOR;
 			}
 		}
 		appendSql( CLOSE_PARENTHESIS );
+		if ( parenthesis ) {
+			appendSql( CLOSE_PARENTHESIS );
+		}
 	}
 
 	@Override