From 21a82b978d6e6b96dadbaf0fcfea6b2bcb97846a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Timo=20Westk=C3=A4mper?= <timo.westkamper@mysema.com>
Date: Sun, 28 Jul 2013 00:04:13 +0300
Subject: [PATCH] #461 Use direct serialization of nulls first/last

---
 querydsl-jpa/pom.xml                                 |  2 +-
 .../java/com/mysema/query/jpa/JPQLSerializer.java    | 12 +++++-------
 .../java/com/mysema/query/AbstractStandardTest.java  |  4 ++--
 3 files changed, 8 insertions(+), 10 deletions(-)

diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml
index 943a59d30..1f6c553d2 100644
--- a/querydsl-jpa/pom.xml
+++ b/querydsl-jpa/pom.xml
@@ -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>
   
diff --git a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java
index ebd40eac5..267b4c239 100644
--- a/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java
+++ b/querydsl-jpa/src/main/java/com/mysema/query/jpa/JPQLSerializer.java
@@ -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;
             }
         }
diff --git a/querydsl-jpa/src/test/java/com/mysema/query/AbstractStandardTest.java b/querydsl-jpa/src/test/java/com/mysema/query/AbstractStandardTest.java
index 5a020272b..1e5afd890 100644
--- a/querydsl-jpa/src/test/java/com/mysema/query/AbstractStandardTest.java
+++ b/querydsl-jpa/src/test/java/com/mysema/query/AbstractStandardTest.java
@@ -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())