Skip to content

Commit ebe9b64

Browse files
committed
HHH-19260 - Remove supportsNullPrecedence() from AbstractSqlAstTranslator (was already in Dialect)
Signed-off-by: Jan Schatteman <[email protected]>
1 parent 0b8444a commit ebe9b64

File tree

4 files changed

+9
-15
lines changed

4 files changed

+9
-15
lines changed

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

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1078,4 +1078,10 @@ public boolean supportsJoinInMutationStatementSubquery() {
10781078
return false;
10791079
}
10801080

1081+
@Override
1082+
public boolean supportsNullPrecedence() {
1083+
// Support for nulls clause in listagg was added in 2.0
1084+
return getVersion().isSameOrAfter( 2 );
1085+
}
1086+
10811087
}

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

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -370,10 +370,8 @@ protected boolean supportsRowValueConstructorDistinctFromSyntax() {
370370
return getDialect().getVersion().isSameOrAfter( 1, 4, 200 );
371371
}
372372

373-
@Override
374-
protected boolean supportsNullPrecedence() {
375-
// Support for nulls clause in listagg was added in 2.0
376-
return getClauseStack().getCurrent() != Clause.WITHIN_GROUP || getDialect().getVersion().isSameOrAfter( 2 );
373+
protected boolean allowsNullPrecedence() {
374+
return getClauseStack().getCurrent() != Clause.WITHIN_GROUP || getDialect().supportsNullPrecedence();
377375
}
378376

379377
private boolean supportsOffsetFetchClause() {

hibernate-core/src/main/java/org/hibernate/dialect/H2SqlAstTranslator.java

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -342,12 +342,6 @@ protected boolean supportsRowValueConstructorDistinctFromSyntax() {
342342
return true;
343343
}
344344

345-
@Override
346-
protected boolean supportsNullPrecedence() {
347-
// Support for nulls clause in listagg was added in 2.0
348-
return true;
349-
}
350-
351345
private boolean supportsOffsetFetchClause() {
352346
return true;
353347
}

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

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4324,7 +4324,7 @@ protected void visitSortSpecification(
43244324
}
43254325
final boolean renderNullPrecedence = nullPrecedence != null
43264326
&& !NullPrecedenceHelper.isDefaultOrdering( nullPrecedence, sortOrder, dialect.getNullOrdering() );
4327-
final boolean supportsNullPrecedence = renderNullPrecedence && supportsNullPrecedence();
4327+
final boolean supportsNullPrecedence = renderNullPrecedence && dialect.supportsNullPrecedence();
43284328
if ( renderNullPrecedence && !supportsNullPrecedence ) {
43294329
emulateSortSpecificationNullPrecedence( sortExpression, nullPrecedence );
43304330
}
@@ -4362,10 +4362,6 @@ protected void renderSortExpression(Expression sortExpression, boolean ignoreCas
43624362
}
43634363
}
43644364

4365-
protected boolean supportsNullPrecedence() {
4366-
return dialect.supportsNullPrecedence();
4367-
}
4368-
43694365
protected void emulateSortSpecificationNullPrecedence(Expression sortExpression, Nulls nullPrecedence) {
43704366
// TODO: generate "virtual" select items and use them here positionally
43714367
appendSql( "case when (" );

0 commit comments

Comments
 (0)