Browse Source

Use non deprecated MySQL dialect for Hibernate 6+

This commit fixes the Hibernate dialect lookup for MySQL as it was
previously using a deprecated dialect that has been removed in the most
recent Hibernate version.

Closes gh-31889
pull/31899/head
Stéphane Nicoll 2 years ago
parent
commit
9f2970bc5c
  1. 5
      spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java

5
spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java vendored

@ -34,6 +34,7 @@ import org.hibernate.dialect.HANAColumnStoreDialect;
import org.hibernate.dialect.HSQLDialect; import org.hibernate.dialect.HSQLDialect;
import org.hibernate.dialect.Informix10Dialect; import org.hibernate.dialect.Informix10Dialect;
import org.hibernate.dialect.MySQL57Dialect; import org.hibernate.dialect.MySQL57Dialect;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.dialect.Oracle12cDialect; import org.hibernate.dialect.Oracle12cDialect;
import org.hibernate.dialect.PostgreSQL95Dialect; import org.hibernate.dialect.PostgreSQL95Dialect;
import org.hibernate.dialect.SQLServer2012Dialect; import org.hibernate.dialect.SQLServer2012Dialect;
@ -193,14 +194,14 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter {
default -> null; default -> null;
}; };
} }
else { // Hibernate 6.2 aligned else { // Hibernate 6.2+ aligned
return switch (database) { return switch (database) {
case DB2 -> DB2Dialect.class; case DB2 -> DB2Dialect.class;
case DERBY -> org.hibernate.dialect.DerbyDialect.class; case DERBY -> org.hibernate.dialect.DerbyDialect.class;
case H2 -> H2Dialect.class; case H2 -> H2Dialect.class;
case HANA -> HANAColumnStoreDialect.class; case HANA -> HANAColumnStoreDialect.class;
case HSQL -> HSQLDialect.class; case HSQL -> HSQLDialect.class;
case MYSQL -> MySQL57Dialect.class; case MYSQL -> MySQLDialect.class;
case ORACLE -> Oracle12cDialect.class; case ORACLE -> Oracle12cDialect.class;
case POSTGRESQL -> org.hibernate.dialect.PostgreSQLDialect.class; case POSTGRESQL -> org.hibernate.dialect.PostgreSQLDialect.class;
case SQL_SERVER -> SQLServer2012Dialect.class; case SQL_SERVER -> SQLServer2012Dialect.class;

Loading…
Cancel
Save