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

HHH-12977 - Update latest dialect for MySQL 

(cherry picked from commit a9fd8efe33)
This commit is contained in:
Yanming Zhou 2018-09-14 16:52:18 +08:00 committed by gbadner
parent 178518b424
commit a7120626ab
4 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
hibernate-core/src/main/java/org/hibernate/boot/registry/selector/internal/StrategySelectorBuilder.java
View File

@ -49,6 +49,7 @@ import org.hibernate.dialect.MckoiDialect;
import org.hibernate.dialect.MimerSQLDialect; import org.hibernate.dialect.MimerSQLDialect;
import org.hibernate.dialect.MySQL57Dialect; import org.hibernate.dialect.MySQL57Dialect;
import org.hibernate.dialect.MySQL57InnoDBDialect; import org.hibernate.dialect.MySQL57InnoDBDialect;
import org.hibernate.dialect.MySQL8Dialect;
import org.hibernate.dialect.MySQL5Dialect; import org.hibernate.dialect.MySQL5Dialect;
import org.hibernate.dialect.MySQL5InnoDBDialect; import org.hibernate.dialect.MySQL5InnoDBDialect;
import org.hibernate.dialect.Oracle10gDialect; import org.hibernate.dialect.Oracle10gDialect;
@ -222,6 +223,7 @@ public class StrategySelectorBuilder {
addDialect( strategySelector, MySQL5InnoDBDialect.class ); addDialect( strategySelector, MySQL5InnoDBDialect.class );
addDialect( strategySelector, MySQL57InnoDBDialect.class ); addDialect( strategySelector, MySQL57InnoDBDialect.class );
addDialect( strategySelector, MySQL57Dialect.class ); addDialect( strategySelector, MySQL57Dialect.class );
addDialect( strategySelector, MySQL8Dialect.class );
addDialect( strategySelector, Oracle8iDialect.class ); addDialect( strategySelector, Oracle8iDialect.class );
addDialect( strategySelector, Oracle9iDialect.class ); addDialect( strategySelector, Oracle9iDialect.class );
addDialect( strategySelector, Oracle10gDialect.class ); addDialect( strategySelector, Oracle10gDialect.class );

2
hibernate-core/src/main/java/org/hibernate/dialect/Database.java
View File

@ -324,7 +324,7 @@ public enum Database {
MYSQL { MYSQL {
@Override @Override
public Class<? extends Dialect> latestDialect() { public Class<? extends Dialect> latestDialect() {
return MySQL57Dialect.class; return MySQL8Dialect.class;
} }
@Override @Override

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

@ -113,7 +113,7 @@ public class DialectFactoryTest extends BaseUnitTestCase {
testDetermination( "MySQL", 5, 5, MySQL55Dialect.class, resolver ); testDetermination( "MySQL", 5, 5, MySQL55Dialect.class, resolver );
testDetermination( "MySQL", 5, 6, MySQL55Dialect.class, resolver ); testDetermination( "MySQL", 5, 6, MySQL55Dialect.class, resolver );
testDetermination( "MySQL", 5, 7, MySQL57Dialect.class, resolver ); testDetermination( "MySQL", 5, 7, MySQL57Dialect.class, resolver );
testDetermination( "MySQL", 8, 0, MySQL57Dialect.class, resolver ); testDetermination( "MySQL", 8, 0, MySQL8Dialect.class, resolver );
testDetermination( "MariaDB", "MariaDB connector/J", 10, 3, MariaDB103Dialect.class, resolver ); testDetermination( "MariaDB", "MariaDB connector/J", 10, 3, MariaDB103Dialect.class, resolver );
testDetermination( "MariaDB", "MariaDB connector/J", 10, 2, MariaDB102Dialect.class, resolver ); testDetermination( "MariaDB", "MariaDB connector/J", 10, 2, MariaDB102Dialect.class, resolver );
testDetermination( "MariaDB", "MariaDB connector/J", 10, 1, MariaDB10Dialect.class, resolver ); testDetermination( "MariaDB", "MariaDB connector/J", 10, 1, MariaDB10Dialect.class, resolver );

15
hibernate-core/src/test/java/org/hibernate/engine/jdbc/dialect/internal/StandardDialectResolverTest.java
View File

@ -126,12 +126,27 @@ public class StandardDialectResolverTest extends BaseUnitTestCase {
runMariaDBDialectTest( 5, 2, MariaDBDialect.class ); runMariaDBDialectTest( 5, 2, MariaDBDialect.class );
} }
@Test
public void testResolveDialectInternalForMySQL57() throws SQLException {
runMySQLDialectTest( 5, 7, MySQL57Dialect.class );
}
@Test
public void testResolveDialectInternalForMySQL8() throws SQLException {
runMySQLDialectTest( 8, 0, MySQL8Dialect.class );
}
private static void runMariaDBDialectTest( private static void runMariaDBDialectTest(
int majorVersion, int minorVersion, Class<? extends MariaDBDialect> expectedDialect) int majorVersion, int minorVersion, Class<? extends MariaDBDialect> expectedDialect)
throws SQLException { throws SQLException {
runDialectTest( "MariaDB", "MariaDB connector/J", majorVersion, minorVersion, expectedDialect ); runDialectTest( "MariaDB", "MariaDB connector/J", majorVersion, minorVersion, expectedDialect );
} }
private static void runMySQLDialectTest(
int majorVersion, int minorVersion, Class<? extends MySQLDialect> expectedDialect)
throws SQLException {
runDialectTest( "MySQL", "MySQL connector/J", majorVersion, minorVersion, expectedDialect );
}
private static void runSQLServerDialectTest( private static void runSQLServerDialectTest(
int version, Class<? extends SQLServerDialect> expectedDialect) int version, Class<? extends SQLServerDialect> expectedDialect)