Skip to content

Commit

Permalink
HHH-18046 Cast parameters used as arithmetic operands on DB2
Browse files Browse the repository at this point in the history
  • Loading branch information
@beikov
beikov committed May 2, 2024
1 parent c369216 commit 88bdfbf
Show file tree
Hide file tree
Showing 23 changed files with 100 additions and 114 deletions.
5 changes: 5 additions & 0 deletions ...ity-dialects/src/main/java/org/hibernate/community/dialect/DB2LegacySqlAstTranslator.java
View file
Expand Up @@ -139,6 +139,11 @@ protected void renderExpressionAsClauseItem(Expression expression) {
}
}

@Override
protected void visitArithmeticOperand(Expression expression) {
render( expression, SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
}

@Override
public void visitBooleanExpressionPredicate(BooleanExpressionPredicate booleanExpressionPredicate) {
if ( getDB2Version().isSameOrAfter( 11 ) ) {
Expand Down
19 changes: 2 additions & 17 deletions ...y-dialects/src/main/java/org/hibernate/community/dialect/DerbyLegacySqlAstTranslator.java
View file
Expand Up @@ -337,23 +337,8 @@ protected boolean supportsJoinInMutationStatementSubquery() {
}

@Override
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
final BinaryArithmeticOperator operator = arithmeticExpression.getOperator();
if ( operator == BinaryArithmeticOperator.MODULO ) {
append( "mod" );
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
appendSql( ',' );
arithmeticExpression.getRightHandOperand().accept( this );
appendSql( CLOSE_PARENTHESIS );
}
else {
appendSql( OPEN_PARENTHESIS );
render( arithmeticExpression.getLeftHandOperand(), SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
render( arithmeticExpression.getRightHandOperand(), SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
appendSql( CLOSE_PARENTHESIS );
}
protected void visitArithmeticOperand(Expression expression) {
render( expression, SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
}

}
9 changes: 7 additions & 2 deletions ...nity-dialects/src/main/java/org/hibernate/community/dialect/H2LegacySqlAstTranslator.java
View file
Expand Up @@ -324,12 +324,17 @@ else if ( expression instanceof Summarization ) {
@Override
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
appendSql( OPEN_PARENTHESIS );
render( arithmeticExpression.getLeftHandOperand(), SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
render( arithmeticExpression.getRightHandOperand(), SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}

@Override
protected void visitArithmeticOperand(Expression expression) {
render( expression, SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
}

@Override
protected boolean renderPrimaryTableReference(TableGroup tableGroup, LockMode lockMode) {
final TableReference tableRef = tableGroup.getPrimaryTableReference();
Expand Down
19 changes: 2 additions & 17 deletions ...ty-dialects/src/main/java/org/hibernate/community/dialect/HSQLLegacySqlAstTranslator.java
View file
Expand Up @@ -352,22 +352,7 @@ private boolean supportsOffsetFetchClause() {
}

@Override
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
final BinaryArithmeticOperator operator = arithmeticExpression.getOperator();
if ( operator == BinaryArithmeticOperator.MODULO ) {
append( "mod" );
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
appendSql( ',' );
arithmeticExpression.getRightHandOperand().accept( this );
appendSql( CLOSE_PARENTHESIS );
}
else {
appendSql( OPEN_PARENTHESIS );
render( arithmeticExpression.getLeftHandOperand(), SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
render( arithmeticExpression.getRightHandOperand(), SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
appendSql( CLOSE_PARENTHESIS );
}
protected void visitArithmeticOperand(Expression expression) {
render( expression, SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
}
}
4 changes: 2 additions & 2 deletions ...lects/src/main/java/org/hibernate/community/dialect/PostgreSQLLegacySqlAstTranslator.java
View file
Expand Up @@ -330,9 +330,9 @@ public void visitLikePredicate(LikePredicate likePredicate) {
@Override
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
arithmeticExpression.getRightHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}

Expand Down
4 changes: 2 additions & 2 deletions ...alects/src/main/java/org/hibernate/community/dialect/SQLServerLegacySqlAstTranslator.java
View file
Expand Up @@ -523,9 +523,9 @@ else if ( expression instanceof Summarization ) {
@Override
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
arithmeticExpression.getRightHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}

Expand Down
4 changes: 2 additions & 2 deletions ...alects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java
View file
Expand Up @@ -460,9 +460,9 @@ else if ( expression instanceof Summarization ) {
@Override
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
arithmeticExpression.getRightHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}

Expand Down
4 changes: 2 additions & 2 deletions ...ialects/src/main/java/org/hibernate/community/dialect/SybaseAnywhereSqlAstTranslator.java
View file
Expand Up @@ -219,9 +219,9 @@ else if ( expression instanceof Summarization ) {
@Override
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
arithmeticExpression.getRightHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}

Expand Down
4 changes: 2 additions & 2 deletions ...-dialects/src/main/java/org/hibernate/community/dialect/SybaseLegacySqlAstTranslator.java
View file
Expand Up @@ -242,9 +242,9 @@ else if ( expression instanceof Summarization ) {
@Override
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
arithmeticExpression.getRightHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}

Expand Down
5 changes: 5 additions & 0 deletions hibernate-core/src/main/java/org/hibernate/dialect/DB2SqlAstTranslator.java
View file
Expand Up @@ -138,6 +138,11 @@ protected void renderExpressionAsClauseItem(Expression expression) {
}
}

@Override
protected void visitArithmeticOperand(Expression expression) {
render( expression, SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
}

@Override
public void visitBooleanExpressionPredicate(BooleanExpressionPredicate booleanExpressionPredicate) {
if ( getDB2Version().isSameOrAfter( 11 ) ) {
Expand Down
19 changes: 2 additions & 17 deletions hibernate-core/src/main/java/org/hibernate/dialect/DerbySqlAstTranslator.java
View file
Expand Up @@ -337,22 +337,7 @@ protected boolean supportsJoinInMutationStatementSubquery() {
}

@Override
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
final BinaryArithmeticOperator operator = arithmeticExpression.getOperator();
if ( operator == BinaryArithmeticOperator.MODULO ) {
append( "mod" );
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
appendSql( ',' );
arithmeticExpression.getRightHandOperand().accept( this );
appendSql( CLOSE_PARENTHESIS );
}
else {
appendSql( OPEN_PARENTHESIS );
render( arithmeticExpression.getLeftHandOperand(), SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
render( arithmeticExpression.getRightHandOperand(), SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
appendSql( CLOSE_PARENTHESIS );
}
protected void visitArithmeticOperand(Expression expression) {
render( expression, SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
}
}
9 changes: 7 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/H2SqlAstTranslator.java
View file
Expand Up @@ -298,12 +298,17 @@ else if ( expression instanceof Summarization ) {
@Override
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
appendSql( OPEN_PARENTHESIS );
render( arithmeticExpression.getLeftHandOperand(), SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
render( arithmeticExpression.getRightHandOperand(), SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}

@Override
protected void visitArithmeticOperand(Expression expression) {
render( expression, SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
}

@Override
protected boolean renderPrimaryTableReference(TableGroup tableGroup, LockMode lockMode) {
final TableReference tableRef = tableGroup.getPrimaryTableReference();
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/HANASqlAstTranslator.java
View file
Expand Up @@ -53,9 +53,9 @@ public HANASqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
if ( isIntegerDivisionEmulationRequired( arithmeticExpression ) ) {
appendSql( "cast(" );
arithmeticExpression.getLeftHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
arithmeticExpression.getRightHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( " as int)" );
}
else {
Expand Down
19 changes: 2 additions & 17 deletions hibernate-core/src/main/java/org/hibernate/dialect/HSQLSqlAstTranslator.java
View file
Expand Up @@ -342,23 +342,8 @@ private boolean supportsOffsetFetchClause() {
}

@Override
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
final BinaryArithmeticOperator operator = arithmeticExpression.getOperator();
if ( operator == BinaryArithmeticOperator.MODULO ) {
append( "mod" );
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
appendSql( ',' );
arithmeticExpression.getRightHandOperand().accept( this );
appendSql( CLOSE_PARENTHESIS );
}
else {
appendSql( OPEN_PARENTHESIS );
render( arithmeticExpression.getLeftHandOperand(), SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
render( arithmeticExpression.getRightHandOperand(), SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
appendSql( CLOSE_PARENTHESIS );
}
protected void visitArithmeticOperand(Expression expression) {
render( expression, SqlAstNodeRenderingMode.NO_PLAIN_PARAMETER );
}

}
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/MariaDBSqlAstTranslator.java
View file
Expand Up @@ -56,9 +56,9 @@ public MariaDBSqlAstTranslator(SessionFactoryImplementor sessionFactory, Stateme
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
if ( isIntegerDivisionEmulationRequired( arithmeticExpression ) ) {
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( " div " );
arithmeticExpression.getRightHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}
else {
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/MySQLSqlAstTranslator.java
View file
Expand Up @@ -106,9 +106,9 @@ private static String getSqlType(CastTarget castTarget, String sqlType, Dialect
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
if ( isIntegerDivisionEmulationRequired( arithmeticExpression ) ) {
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( " div " );
arithmeticExpression.getRightHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}
else {
Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLSqlAstTranslator.java
View file
Expand Up @@ -328,9 +328,9 @@ public void visitLikePredicate(LikePredicate likePredicate) {
@Override
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
arithmeticExpression.getRightHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}
}
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/SQLServerSqlAstTranslator.java
View file
Expand Up @@ -492,9 +492,9 @@ else if ( expression instanceof Summarization ) {
@Override
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
arithmeticExpression.getRightHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}

Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/SybaseASESqlAstTranslator.java
View file
Expand Up @@ -443,9 +443,9 @@ else if ( expression instanceof Summarization ) {
@Override
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
arithmeticExpression.getRightHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}

Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/SybaseSqlAstTranslator.java
View file
Expand Up @@ -241,9 +241,9 @@ else if ( expression instanceof Summarization ) {
@Override
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
arithmeticExpression.getRightHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}

Expand Down
4 changes: 2 additions & 2 deletions hibernate-core/src/main/java/org/hibernate/dialect/TiDBSqlAstTranslator.java
View file
Expand Up @@ -59,9 +59,9 @@ public TiDBSqlAstTranslator(SessionFactoryImplementor sessionFactory, Statement
public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeticExpression) {
if ( isIntegerDivisionEmulationRequired( arithmeticExpression ) ) {
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( " div " );
arithmeticExpression.getRightHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}
else {
Expand Down
12 changes: 8 additions & 4 deletions hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
View file
Expand Up @@ -7190,20 +7190,24 @@ public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeti
if ( operator == BinaryArithmeticOperator.MODULO ) {
append( "mod" );
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( ',' );
arithmeticExpression.getRightHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}
else {
appendSql( OPEN_PARENTHESIS );
arithmeticExpression.getLeftHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getLeftHandOperand() );
appendSql( arithmeticExpression.getOperator().getOperatorSqlTextString() );
arithmeticExpression.getRightHandOperand().accept( this );
visitArithmeticOperand( arithmeticExpression.getRightHandOperand() );
appendSql( CLOSE_PARENTHESIS );
}
}

protected void visitArithmeticOperand(Expression expression) {
expression.accept( this );
}

@Override
public void visitDuration(Duration duration) {
duration.getMagnitude().accept( this );
Expand Down

0 comments on commit 88bdfbf

Please sign in to comment.