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

Fix default null ordering for H2 and re-enable test

This commit is contained in:
Christian Beikov 2021-12-23 00:31:53 +01:00
parent ef6f190925
commit 90e551da4b
3 changed files with 5 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java
View File

@ -389,7 +389,7 @@ public class H2Dialect extends Dialect {
@Override @Override
public NullOrdering getNullOrdering() { public NullOrdering getNullOrdering() {
return NullOrdering.FIRST; return NullOrdering.SMALLEST;
} }
@Override @Override

17
hibernate-core/src/main/java/org/hibernate/sql/ast/tree/from/CorrelatedTableGroup.java
View File

@ -76,14 +76,14 @@ public class CorrelatedTableGroup extends AbstractTableGroup {
String tableExpression, String tableExpression,
boolean allowFkOptimization, boolean allowFkOptimization,
boolean resolve) { boolean resolve) {
final TableReference primaryTableReference = correlatedTableGroup.getPrimaryTableReference().getTableReference( final TableReference tableReference = correlatedTableGroup.getTableReference(
navigablePath, navigablePath,
tableExpression, tableExpression,
allowFkOptimization, allowFkOptimization,
resolve resolve
); );
if ( primaryTableReference != null ) { if ( tableReference != null ) {
return primaryTableReference; return tableReference;
} }
for ( TableGroupJoin tableGroupJoin : getNestedTableGroupJoins() ) { for ( TableGroupJoin tableGroupJoin : getNestedTableGroupJoins() ) {
final TableReference groupTableReference = tableGroupJoin.getJoinedGroup() final TableReference groupTableReference = tableGroupJoin.getJoinedGroup()
@ -101,17 +101,6 @@ public class CorrelatedTableGroup extends AbstractTableGroup {
return groupTableReference; return groupTableReference;
} }
} }
for ( TableReferenceJoin tableReferenceJoin : correlatedTableGroup.getTableReferenceJoins() ) {
final TableReference tableReference = tableReferenceJoin.getJoinedTableReference().getTableReference(
navigablePath,
tableExpression,
allowFkOptimization,
resolve
);
if ( tableReference != null ) {
return tableReference;
}
}
return null; return null;
} }

2
hibernate-core/src/test/java/org/hibernate/query/criteria/internal/NullPrecedenceTest.java → hibernate-core/src/test/java/org/hibernate/orm/test/query/criteria/internal/NullPrecedenceTest.java
View File

@ -1,4 +1,4 @@
package org.hibernate.query.criteria.internal; package org.hibernate.orm.test.query.criteria.internal;
import java.util.List; import java.util.List;