From 9f2970bc5c06b443c12b7825a3180ef2fa292474 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?St=C3=A9phane=20Nicoll?= Date: Fri, 22 Dec 2023 15:03:40 +0100 Subject: [PATCH] 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 --- .../orm/jpa/vendor/HibernateJpaVendorAdapter.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java index 35e34636f5d..5c24bd4f24a 100644 --- a/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java +++ b/spring-orm/src/main/java/org/springframework/orm/jpa/vendor/HibernateJpaVendorAdapter.java @@ -34,6 +34,7 @@ import org.hibernate.dialect.HANAColumnStoreDialect; import org.hibernate.dialect.HSQLDialect; import org.hibernate.dialect.Informix10Dialect; import org.hibernate.dialect.MySQL57Dialect; +import org.hibernate.dialect.MySQLDialect; import org.hibernate.dialect.Oracle12cDialect; import org.hibernate.dialect.PostgreSQL95Dialect; import org.hibernate.dialect.SQLServer2012Dialect; @@ -193,14 +194,14 @@ public class HibernateJpaVendorAdapter extends AbstractJpaVendorAdapter { default -> null; }; } - else { // Hibernate 6.2 aligned + else { // Hibernate 6.2+ aligned return switch (database) { case DB2 -> DB2Dialect.class; case DERBY -> org.hibernate.dialect.DerbyDialect.class; case H2 -> H2Dialect.class; case HANA -> HANAColumnStoreDialect.class; case HSQL -> HSQLDialect.class; - case MYSQL -> MySQL57Dialect.class; + case MYSQL -> MySQLDialect.class; case ORACLE -> Oracle12cDialect.class; case POSTGRESQL -> org.hibernate.dialect.PostgreSQLDialect.class; case SQL_SERVER -> SQLServer2012Dialect.class;