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

HHH-6509 - Aligns with metamodel-to-master merge.

This commit is contained in:
Karel Maesen 2014-04-08 23:47:30 +02:00 committed by Steve Ebersole
parent 55bec79cd4
commit eb8992a70b
3 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
hibernate-spatial/src/main/java/org/hibernate/spatial/integration/SpatialDialectFactory.java
View File

@ -1,11 +1,11 @@
package org.hibernate.spatial.integration; package org.hibernate.spatial.integration;
import java.sql.Connection;
import java.util.Map; import java.util.Map;
import org.hibernate.HibernateException; import org.hibernate.HibernateException;
import org.hibernate.dialect.Dialect; import org.hibernate.dialect.Dialect;
import org.hibernate.engine.jdbc.dialect.internal.DialectFactoryImpl; import org.hibernate.engine.jdbc.dialect.internal.DialectFactoryImpl;
import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfoSource;
import org.hibernate.spatial.HibernateSpatialConfiguration; import org.hibernate.spatial.HibernateSpatialConfiguration;
import org.hibernate.spatial.dialect.oracle.OracleSpatial10gDialect; import org.hibernate.spatial.dialect.oracle.OracleSpatial10gDialect;
@ -32,8 +32,8 @@ public class SpatialDialectFactory extends DialectFactoryImpl {
} }
@Override @Override
public Dialect buildDialect(Map configValues, Connection connection) throws HibernateException { public Dialect buildDialect(Map configValues, DialectResolutionInfoSource resolutionInfoSource) throws HibernateException {
final Dialect dialect = super.buildDialect( configValues, connection ); final Dialect dialect = super.buildDialect( configValues, resolutionInfoSource );
if (dialect instanceof OracleSpatial10gDialect) { if (dialect instanceof OracleSpatial10gDialect) {
return new OracleSpatial10gDialect( configuration ); return new OracleSpatial10gDialect( configuration );
} }

4
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/SpatialFunctionalTestCase.java
View File

@ -109,8 +109,8 @@ public abstract class SpatialFunctionalTestCase extends BaseCoreFunctionalTestCa
* *
* @return * @return
*/ */
public void afterMetadataBuilt(MetadataImplementor metadataImplementor) { protected void afterMetadataBuilt(MetadataImplementor metadataImplementor) {
super.afterMetadataBuilt( metadataImplementor ); super.afterConstructAndConfigureMetadata( metadataImplementor );
initializeSpatialTestSupport( metadataImplementor ); initializeSpatialTestSupport( metadataImplementor );
} }

8
hibernate-spatial/src/test/java/org/hibernate/spatial/testing/TestSupport.java
View File

@ -51,18 +51,18 @@ public abstract class TestSupport {
public abstract SQLExpressionTemplate getSQLExpressionTemplate(); public abstract SQLExpressionTemplate getSQLExpressionTemplate();
protected String driver() { protected String driver() {
return configurationService.getSetting( AvailableSettings.DRIVER ); return configurationService.getSetting( AvailableSettings.DRIVER, String.class, "" );
} }
protected String url() { protected String url() {
return configurationService.getSetting( AvailableSettings.URL ); return configurationService.getSetting( AvailableSettings.URL, String.class, "" );
} }
protected String user() { protected String user() {
return configurationService.getSetting( AvailableSettings.USER ); return configurationService.getSetting( AvailableSettings.USER, String.class, "" );
} }
protected String passwd() { protected String passwd() {
return configurationService.getSetting( AvailableSettings.PASS ); return configurationService.getSetting( AvailableSettings.PASS, String.class, "" );
} }
} }