Hibernate/hibernate-orm
1
0
Fork 0
mirror of https://github.com/hibernate/hibernate-orm synced 2025-02-18 09:05:21 +00:00
Code Issues Packages Projects Releases Wiki Activity

HHH-8504 add MySQL5Dialect to StandardDatabaseInfoDialectResolver

Browse Source 
Conflicts:
	hibernate-core/src/main/java/org/hibernate/engine/jdbc/dialect/internal/StandardDatabaseInfoDialectResolver.java
This commit is contained in:
Brett Meyer 2013-09-17 16:23:12 -04:00
parent 121346c86c
commit 67ddd01002
2 changed files with 6 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
hibernate-core/src/main/java/org/hibernate/service/jdbc/dialect/internal/StandardDialectResolver.java
View File

@ -40,6 +40,7 @@
import org.hibernate.dialect.Ingres10Dialect; import org.hibernate.dialect.Ingres10Dialect;
import org.hibernate.dialect.Ingres9Dialect; import org.hibernate.dialect.Ingres9Dialect;
import org.hibernate.dialect.IngresDialect; import org.hibernate.dialect.IngresDialect;
import org.hibernate.dialect.MySQL5Dialect;
import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.MySQLDialect;
import org.hibernate.dialect.Oracle10gDialect; import org.hibernate.dialect.Oracle10gDialect;
import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.dialect.Oracle8iDialect;
@ -82,6 +83,9 @@ protected Dialect resolveDialectInternal(DatabaseMetaData metaData) throws SQLEx
} }
if ( "MySQL".equals( databaseName ) ) { if ( "MySQL".equals( databaseName ) ) {
if (databaseMajorVersion >= 5 ) {
return new MySQL5Dialect();
}
return new MySQLDialect(); return new MySQLDialect();
} }

2
hibernate-core/src/test/java/org/hibernate/dialect/resolver/DialectFactoryTest.java
View File

@ -45,6 +45,7 @@
import org.hibernate.dialect.InformixDialect; import org.hibernate.dialect.InformixDialect;
import org.hibernate.dialect.IngresDialect; import org.hibernate.dialect.IngresDialect;
import org.hibernate.dialect.Mocks; import org.hibernate.dialect.Mocks;
import org.hibernate.dialect.MySQL5Dialect;
import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.MySQLDialect;
import org.hibernate.dialect.Oracle10gDialect; import org.hibernate.dialect.Oracle10gDialect;
import org.hibernate.dialect.Oracle8iDialect; import org.hibernate.dialect.Oracle8iDialect;
@ -128,6 +129,7 @@ public void testPreregisteredDialects() {
testDetermination( "HSQL Database Engine", HSQLDialect.class, resolver ); testDetermination( "HSQL Database Engine", HSQLDialect.class, resolver );
testDetermination( "H2", H2Dialect.class, resolver ); testDetermination( "H2", H2Dialect.class, resolver );
testDetermination( "MySQL", MySQLDialect.class, resolver ); testDetermination( "MySQL", MySQLDialect.class, resolver );
testDetermination( "MySQL", 5, 0, MySQL5Dialect.class, resolver );
testDetermination( "PostgreSQL", PostgreSQL81Dialect.class, resolver ); testDetermination( "PostgreSQL", PostgreSQL81Dialect.class, resolver );
testDetermination( "PostgreSQL", 8, 2, PostgreSQL82Dialect.class, resolver ); testDetermination( "PostgreSQL", 8, 2, PostgreSQL82Dialect.class, resolver );
testDetermination( "Apache Derby", 10, 4, DerbyDialect.class, resolver ); testDetermination( "Apache Derby", 10, 4, DerbyDialect.class, resolver );