Skip to content

HHH-19929 Render special DB2 for i VALUES expression to avoid parameter type inference issues #11427

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
beikov wants to merge 1 commit into
base: 6.6
Choose a base branch
from
+66 −28
Open

HHH-19929 Render special DB2 for i VALUES expression to avoid parameter type inference issues #11427

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions ...ty-dialects/src/main/java/org/hibernate/community/dialect/DB2iLegacySqlAstTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,12 +6,15 @@
*/
package org.hibernate.community.dialect;

import java.util.List;

import org.hibernate.dialect.DatabaseVersion;
import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.query.sqm.ComparisonOperator;
import org.hibernate.sql.ast.tree.Statement;
import org.hibernate.sql.ast.tree.expression.Expression;
import org.hibernate.sql.ast.tree.expression.Literal;
import org.hibernate.sql.ast.tree.expression.SqlTupleContainer;
import org.hibernate.sql.ast.tree.select.QueryPart;
import org.hibernate.sql.exec.spi.JdbcOperation;

Expand Down Expand Up @@ -58,6 +61,20 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
renderComparisonStandard( lhs, operator, rhs );
}

@Override
protected void renderExpressionsAsValuesSubquery(int tupleSize, List<Expression> listExpressions) {
// DB2 for i supports type-inference in this special VALUES expression, but not if it's wrapped as SELECT
appendSql( "values" );
char separator = ' ';
for ( Expression expression : listExpressions ) {
appendSql( separator );
appendSql( OPEN_PARENTHESIS );
renderCommaSeparated( SqlTupleContainer.getSqlTuple( expression ).getExpressions() );
appendSql( CLOSE_PARENTHESIS );
separator = ',';
}
}

@Override
public DatabaseVersion getDB2Version() {
return DB2_LUW_VERSION9;
Expand Down
17 changes: 17 additions & 0 deletions hibernate-core/src/main/java/org/hibernate/dialect/DB2iSqlAstTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,11 +6,14 @@
*/
package org.hibernate.dialect;

import java.util.List;

import org.hibernate.engine.spi.SessionFactoryImplementor;
import org.hibernate.query.sqm.ComparisonOperator;
import org.hibernate.sql.ast.tree.Statement;
import org.hibernate.sql.ast.tree.expression.Expression;
import org.hibernate.sql.ast.tree.expression.Literal;
import org.hibernate.sql.ast.tree.expression.SqlTupleContainer;
import org.hibernate.sql.ast.tree.select.QueryPart;
import org.hibernate.sql.exec.spi.JdbcOperation;

Expand Down Expand Up @@ -56,6 +59,20 @@ protected void renderComparison(Expression lhs, ComparisonOperator operator, Exp
renderComparisonStandard( lhs, operator, rhs );
}

@Override
protected void renderExpressionsAsValuesSubquery(int tupleSize, List<Expression> listExpressions) {
// DB2 for i supports type-inference in this special VALUES expression, but not if it's wrapped as SELECT
appendSql( "values" );
char separator = ' ';
for ( Expression expression : listExpressions ) {
appendSql( separator );
appendSql( OPEN_PARENTHESIS );
renderCommaSeparated( SqlTupleContainer.getSqlTuple( expression ).getExpressions() );
appendSql( CLOSE_PARENTHESIS );
separator = ',';
}
}

@Override
public DatabaseVersion getDB2Version() {
return DB2_LUW_VERSION;
Expand Down
60 changes: 32 additions & 28 deletions hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7705,38 +7705,12 @@ public void visitInListPredicate(InListPredicate inListPredicate) {
else if ( !supportsRowValueConstructorSyntaxInInList() ) {
// Some DBs like Oracle support tuples only for the IN subquery predicate
if ( supportsRowValueConstructorSyntaxInInSubQuery() && dialect.supportsValuesList() ) {
final int tupleSize = lhsTuple.getExpressionType().getJdbcTypeCount();
inListPredicate.getTestExpression().accept( this );
if ( inListPredicate.isNegated() ) {
appendSql( " not" );
}
appendSql( " in (select" );
char separator = ' ';
for ( int i = 0; i < tupleSize; i++ ) {
appendSql( separator );
appendSql( "v_.c" );
appendSql( i );
separator = ',';
}
appendSql( " from (values" );
separator = ' ';
for ( Expression expression : listExpressions ) {
appendSql( separator );
appendSql( OPEN_PARENTHESIS );
renderCommaSeparated( SqlTupleContainer.getSqlTuple( expression ).getExpressions() );
appendSql( CLOSE_PARENTHESIS );
separator = ',';
}
appendSql( CLOSE_PARENTHESIS );
appendSql( " v_" );
separator = '(';
for ( int i = 0; i < tupleSize; i++ ) {
appendSql( separator );
appendSql( "c" );
appendSql( i );
separator = ',';
}
appendSql( CLOSE_PARENTHESIS );
appendSql( " in (" );
renderExpressionsAsValuesSubquery( lhsTuple.getExpressionType().getJdbcTypeCount(), listExpressions );
appendSql( CLOSE_PARENTHESIS );
}
else if ( supportsRowValueConstructorSyntaxInInSubQuery() && dialect.supportsUnionAll() ) {
Expand Down Expand Up @@ -7835,6 +7809,36 @@ else if ( supportsRowValueConstructorSyntaxInInSubQuery() && dialect.supportsUni
}
}

protected void renderExpressionsAsValuesSubquery(int tupleSize, List<Expression> listExpressions) {
appendSql( "select" );
char separator = ' ';
for ( int i = 0; i < tupleSize; i++ ) {
appendSql( separator );
appendSql( "v_.c" );
appendSql( i );
separator = ',';
}
appendSql( " from (values" );
separator = ' ';
for ( Expression expression : listExpressions ) {
appendSql( separator );
appendSql( OPEN_PARENTHESIS );
renderCommaSeparated( SqlTupleContainer.getSqlTuple( expression ).getExpressions() );
appendSql( CLOSE_PARENTHESIS );
separator = ',';
}
appendSql( CLOSE_PARENTHESIS );
appendSql( " v_" );
separator = '(';
for ( int i = 0; i < tupleSize; i++ ) {
appendSql( separator );
appendSql( "c" );
appendSql( i );
separator = ',';
}
appendSql( CLOSE_PARENTHESIS );
}

private void appendInClauseSeparator(InListPredicate inListPredicate) {
appendSql( CLOSE_PARENTHESIS );
appendSql( inListPredicate.isNegated() ? " and " : " or " );
Expand Down
Loading