#461 Use direct serialization of nulls first/last

This commit is contained in:
Timo Westkämper 2013-07-28 00:04:13 +03:00
parent 96bf5a0134
commit 21a82b978d
3 changed files with 8 additions and 10 deletions

View File

@ -16,7 +16,7 @@
<packaging>jar</packaging>
<properties>
<hibernate.version>4.1.7.Final</hibernate.version>
<hibernate.version>4.2.0.Final</hibernate.version>
<hibernate.validator.version>4.3.0.Final</hibernate.validator.version>
</properties>

View File

@ -227,14 +227,12 @@ public class JPQLSerializer extends SerializerBase<JPQLSerializer> {
append(COMMA);
}
handle(os.getTarget());
if (os.getNullHandling() == OrderSpecifier.NullHandling.NullsFirst) {
append(" is not null, ");
handle(os.getTarget());
} else if (os.getNullHandling() == OrderSpecifier.NullHandling.NullsLast) {
append(" is null, ");
handle(os.getTarget());
}
append(os.getOrder() == Order.ASC ? " asc" : " desc");
if (os.getNullHandling() == OrderSpecifier.NullHandling.NullsFirst) {
append(" nulls first");
} else if (os.getNullHandling() == OrderSpecifier.NullHandling.NullsLast) {
append(" nulls last");
}
first = false;
}
}

View File

@ -794,7 +794,7 @@ public abstract class AbstractStandardTest {
}
@Test
@Ignore
@NoBatooJPA
public void Order_NullsFirst() {
assertNull(query().from(cat)
.orderBy(cat.dateField.asc().nullsFirst())
@ -802,7 +802,7 @@ public abstract class AbstractStandardTest {
}
@Test
@Ignore
@NoBatooJPA
public void Order_NullsLast() {
assertNotNull(query().from(cat)
.orderBy(cat.dateField.asc().nullsLast())