Merge f187ae8 into 86c98d6

querydsl · Dec 21, 2019 · 54caf39 · 54caf39
2 parents 86c98d6 + f187ae8
commit 54caf39
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 25 deletions.
diff --git a/pom.xml b/pom.xml
@@ -53,8 +53,8 @@
     <firebird.version>2.2.5</firebird.version>
 
     <!-- JPA deps -->
-    <hibernate.version>4.3.11.Final</hibernate.version>
-    <hibernate.validator.version>4.3.1.Final</hibernate.validator.version>
+    <hibernate.version>5.4.8.Final</hibernate.version>
+    <hibernate.validator.version>6.0.18.Final</hibernate.validator.version>
     <eclipselink.version>2.6.2</eclipselink.version>
 
     <guava.version>18.0</guava.version>

diff --git a/querydsl-jpa/pom.xml b/querydsl-jpa/pom.xml
@@ -50,7 +50,7 @@
       <optional>true</optional>
     </dependency>
     <dependency>
-      <groupId>org.hibernate</groupId>
+      <groupId>org.hibernate.validator</groupId>
       <artifactId>hibernate-validator</artifactId>
       <version>${hibernate.validator.version}</version>
       <optional>true</optional>

diff --git a/querydsl-jpa/src/main/java/com/querydsl/jpa/HibernateHandler.java b/querydsl-jpa/src/main/java/com/querydsl/jpa/HibernateHandler.java
@@ -17,10 +17,9 @@
 
 import javax.persistence.Query;
 
-import org.hibernate.SQLQuery;
 import org.hibernate.ScrollMode;
 import org.hibernate.ScrollableResults;
-import org.hibernate.jpa.HibernateQuery;
+import org.hibernate.query.NativeQuery;
 import org.hibernate.transform.ResultTransformer;
 
 import com.mysema.commons.lang.CloseableIterator;
@@ -37,21 +36,17 @@ class HibernateHandler implements QueryHandler {
 
     @Override
     public void addEntity(Query query, String alias, Class<?> type) {
-        if (query instanceof HibernateQuery) {
-            org.hibernate.Query hibernateQuery = ((HibernateQuery) query).getHibernateQuery();
-            if (hibernateQuery instanceof SQLQuery) {
-                ((SQLQuery) hibernateQuery).addEntity(alias, type);
-            }
+        if (query instanceof NativeQuery) {
+            NativeQuery hibernateQuery = (NativeQuery) query;
+            hibernateQuery.addEntity(alias, type);
         }
     }
 
     @Override
     public void addScalar(Query query, String alias, Class<?> type) {
-        if (query instanceof HibernateQuery) {
-            org.hibernate.Query hibernateQuery = ((HibernateQuery) query).getHibernateQuery();
-            if (hibernateQuery instanceof SQLQuery) {
-                ((SQLQuery) hibernateQuery).addScalar(alias);
-            }
+        if (query instanceof NativeQuery) {
+            NativeQuery hibernateQuery = (NativeQuery) query;
+            hibernateQuery.addScalar(alias);
         }
     }
 
@@ -63,9 +58,9 @@ public boolean createNativeQueryTyped() {
     @SuppressWarnings("unchecked")
     @Override
     public <T> CloseableIterator<T> iterate(Query query, FactoryExpression<?> projection) {
-        if (query instanceof HibernateQuery) {
-            HibernateQuery hQuery = (HibernateQuery) query;
-            ScrollableResults results = hQuery.getHibernateQuery().scroll(ScrollMode.FORWARD_ONLY);
+        if (query instanceof NativeQuery) {
+            NativeQuery hQuery = (NativeQuery) query;
+            ScrollableResults results = hQuery.scroll(ScrollMode.FORWARD_ONLY);
             CloseableIterator<T> iterator = new ScrollableResultsIterator<T>(results);
             if (projection != null) {
                 iterator = new TransformingIterator<T>(iterator, projection);
@@ -81,11 +76,12 @@ public <T> CloseableIterator<T> iterate(Query query, FactoryExpression<?> projec
         }
     }
 
+    @SuppressWarnings("deprecation")
     @Override
     public boolean transform(Query query, FactoryExpression<?> projection) {
-        if (query instanceof HibernateQuery) {
+        if (query instanceof NativeQuery) {
             ResultTransformer transformer = new FactoryExpressionTransformer(projection);
-            ((HibernateQuery) query).getHibernateQuery().setResultTransformer(transformer);
+            ((NativeQuery) query).setResultTransformer(transformer);
             return true;
         } else {
             return false;

diff --git a/querydsl-jpa/src/test/java/com/querydsl/jpa/support/TeradataDialect.java b/querydsl-jpa/src/test/java/com/querydsl/jpa/support/TeradataDialect.java
@@ -141,11 +141,6 @@ public String getForUpdateString() {
         return "";
     }
 
-    @Override
-    public boolean supportsIdentityColumns() {
-        return false;
-    }
-
     @Override
     public boolean supportsSequences() {
         return false;