Skip to content

Commit 58a17d0

Browse files
committed
Revert "special handling for literal null inside a cast in select clause"
This reverts commit 150d4f8.
1 parent 0b33488 commit 58a17d0

File tree

4 files changed

+2
-19
lines changed

4 files changed

+2
-19
lines changed

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqlAstTranslator.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -245,7 +245,7 @@ public void visitValuesTableReference(ValuesTableReference tableReference) {
245245
protected boolean shouldEmulateFetchClause(QueryPart queryPart) {
246246
// Check if current query part is already row numbering to avoid infinite recursion
247247
return useOffsetFetchClause( queryPart ) && getQueryPartForRowNumbering() != queryPart
248-
&& getDialect().supportsWindowFunctions() && !isRowsOnlyFetchClauseType( queryPart );
248+
&& getDialect().supportsWindowFunctions() && !isRowsOnlyFetchClauseType( queryPart );
249249
}
250250

251251
@Override

hibernate-core/src/main/java/org/hibernate/dialect/function/CastFunction.java

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -77,9 +77,6 @@ public void render(
7777
renderCastArrayToString( sqlAppender, arguments.get( 0 ), dialect, walker );
7878
}
7979
else {
80-
if ( source instanceof QueryLiteral<?> literal && literal.getLiteralValue() == null ) {
81-
literal.setInCast(true);
82-
}
8380
new PatternRenderer( dialect.castPattern( sourceType, targetType ) )
8481
.render( sqlAppender, arguments, walker );
8582
}

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

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7503,12 +7503,7 @@ public void visitJdbcLiteral(JdbcLiteral<?> jdbcLiteral) {
75037503

75047504
@Override
75057505
public void visitQueryLiteral(QueryLiteral<?> queryLiteral) {
7506-
if ( queryLiteral.getLiteralValue() == null && queryLiteral.isInCast() ) {
7507-
appendSql( SqlAppender.NULL_KEYWORD );
7508-
}
7509-
else {
7510-
visitLiteral( queryLiteral );
7511-
}
7506+
visitLiteral( queryLiteral );
75127507
}
75137508

75147509
@Override

hibernate-core/src/main/java/org/hibernate/sql/ast/tree/expression/QueryLiteral.java

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,6 @@
3030
public class QueryLiteral<T> implements Literal, DomainResultProducer<T> {
3131
private final T value;
3232
private final SqlExpressible expressible;
33-
private boolean inCast;
3433

3534
public QueryLiteral(T value, SqlExpressible expressible) {
3635
assert value == null || expressible.getJdbcMapping().getJdbcJavaType().isInstance( value );
@@ -101,12 +100,4 @@ public void applySqlSelections(DomainResultCreationState creationState) {
101100
creationState.getSqlAstCreationState().getCreationContext().getMappingMetamodel().getTypeConfiguration()
102101
);
103102
}
104-
105-
public void setInCast(boolean inCast) {
106-
this.inCast = inCast;
107-
}
108-
109-
public boolean isInCast() {
110-
return inCast;
111-
}
112103
}

0 commit comments

Comments
 (0)