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

HHH-16589 Limit in clause padding to Dialect.getInExpressionCountLimit and fix negated in predicate splitting

This commit is contained in:
Christian Beikov 2023-06-14 18:09:17 +02:00
parent 56955367ba
commit 1cc94c76b9
1 changed files with 30 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6839,13 +6839,6 @@ public abstract class AbstractSqlAstTranslator<T extends JdbcOperation> implemen
} }
} }
inListPredicate.getTestExpression().accept( this );
if ( inListPredicate.isNegated() ) {
appendSql( " not" );
}
appendSql( " in (" );
String separator = NO_SEPARATOR;
int bindValueCount = listExpressions.size(); int bindValueCount = listExpressions.size();
int bindValueMaxCount = bindValueCount; int bindValueMaxCount = bindValueCount;
@ -6881,6 +6874,19 @@ public abstract class AbstractSqlAstTranslator<T extends JdbcOperation> implemen
} }
} }
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(); final Iterator<Expression> iterator = listExpressions.iterator();
int itemNumber = 0; int itemNumber = 0;
while ( iterator.hasNext() && ( inExprLimit == 0 || itemNumber < inExprLimit ) ) { while ( iterator.hasNext() && ( inExprLimit == 0 || itemNumber < inExprLimit ) ) {
@ -6904,11 +6910,15 @@ public abstract class AbstractSqlAstTranslator<T extends JdbcOperation> implemen
if ( inExprLimit > 0 && bindValueCount > inExprLimit ) { if ( inExprLimit > 0 && bindValueCount > inExprLimit ) {
do { do {
append( ") or " );
inListPredicate.getTestExpression().accept( this );
if ( inListPredicate.isNegated() ) { if ( inListPredicate.isNegated() ) {
append( ") and " );
inListPredicate.getTestExpression().accept( this );
appendSql( " not" ); appendSql( " not" );
} }
else {
append( ") or " );
inListPredicate.getTestExpression().accept( this );
}
appendSql( " in (" ); appendSql( " in (" );
separator = NO_SEPARATOR; separator = NO_SEPARATOR;
itemNumber = 0; itemNumber = 0;
@ -6924,13 +6934,23 @@ public abstract class AbstractSqlAstTranslator<T extends JdbcOperation> implemen
if ( inClauseParameterPaddingEnabled ) { if ( inClauseParameterPaddingEnabled ) {
final Expression lastExpression = itemAccessor.apply( listExpressions.get( listExpressions.size() - 1 ) ); 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 ); appendSql( separator );
lastExpression.accept( this ); lastExpression.accept( this );
separator = COMMA_SEPARATOR; separator = COMMA_SEPARATOR;
} }
} }
appendSql( CLOSE_PARENTHESIS ); appendSql( CLOSE_PARENTHESIS );
if ( parenthesis ) {
appendSql( CLOSE_PARENTHESIS );
}
} }
@Override @Override