updated remaining hibernate integrators for #302 fix

Blazebit · Dec 14, 2016 · d8e659b · d8e659b
1 parent 0198ffa
commit d8e659b
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 5 deletions.
diff --git a/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityFunctionTest.java b/core/testsuite/src/test/java/com/blazebit/persistence/testsuite/EntityFunctionTest.java
@@ -295,8 +295,7 @@ public void testValuesEntityFunctionInCte() {
     }
 
     @Test
-    // NOTE: Entity joins are supported since Hibernate 5.1, Datanucleus 5 and latest Eclipselink
-    @Category({ NoHibernate42.class, NoHibernate43.class, NoHibernate50.class, NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
+    @Category({ NoDatanucleus.class, NoEclipselink.class, NoOpenJPA.class })
     public void testValuesEntityFunctionWithCteEntity() {
         CriteriaBuilder<Tuple> cb = cbf.create(em, Tuple.class);
         cb.setProperty(ConfigurationProperties.VALUES_CLAUSE_FILTER_NULLS, "false");

diff --git a/...rnate-4.2/src/main/java/com/blazebit/persistence/impl/hibernate/Hibernate4Integrator.java b/...rnate-4.2/src/main/java/com/blazebit/persistence/impl/hibernate/Hibernate4Integrator.java
@@ -88,7 +88,7 @@ public void integrate(Configuration configuration, SessionFactoryImplementor ses
         }
 
         serviceRegistry.locateServiceBinding(PersisterClassResolver.class).setService(new CustomPersisterClassResolver());
-        serviceRegistry.locateServiceBinding(Database.class).setService(new SimpleDatabase(configuration.getTableMappings()));
+        serviceRegistry.locateServiceBinding(Database.class).setService(new SimpleDatabase(configuration.getTableMappings(), sessionFactory.getDialect(), configuration.buildMapping()));
     }
 
     @Override

diff --git a/...nate-4.3/src/main/java/com/blazebit/persistence/impl/hibernate/Hibernate43Integrator.java b/...nate-4.3/src/main/java/com/blazebit/persistence/impl/hibernate/Hibernate43Integrator.java
@@ -85,7 +85,7 @@ public void integrate(Configuration configuration, SessionFactoryImplementor ses
         }
 
         serviceRegistry.locateServiceBinding(PersisterClassResolver.class).setService(new CustomPersisterClassResolver());
-        serviceRegistry.locateServiceBinding(Database.class).setService(new SimpleDatabase(configuration.getTableMappings()));
+        serviceRegistry.locateServiceBinding(Database.class).setService(new SimpleDatabase(configuration.getTableMappings(), sessionFactory.getDialect(), configuration.buildMapping()));
     }
 
     @Override

diff --git a/...nate-6.0/src/main/java/com/blazebit/persistence/impl/hibernate/Hibernate60Integrator.java b/...nate-6.0/src/main/java/com/blazebit/persistence/impl/hibernate/Hibernate60Integrator.java
@@ -44,7 +44,7 @@ public void integrate(Metadata metadata, SessionFactoryImplementor sessionFactor
         }
 
         serviceRegistry.locateServiceBinding(PersisterClassResolver.class).setService(new CustomPersisterClassResolver());
-        serviceRegistry.locateServiceBinding(Database.class).setService(new SimpleDatabase(metadata.getDatabase().getDefaultNamespace().getTables().iterator()));
+        serviceRegistry.locateServiceBinding(Database.class).setService(new SimpleDatabase(metadata.getDatabase().getDefaultNamespace().getTables().iterator(), sessionFactory.getJdbcServices().getDialect(), metadata));
     }
 
     @Override