HHH-19752 Allow setting MariaDB/MySQL storage engine not only using System properties but also configuration properties

Author: dreab8

hibernate-core/src/main/java/org/hibernate/cfg/SchemaToolingSettings.java

@@ -296,9 +296,10 @@ public interface SchemaToolingSettings {
 
 	/**
 	 * Specifies the default storage engine for a relational database that supports
-	 * multiple storage engines. This property must be set either as an {@link Environment}
-	 * variable or JVM System Property, since the {@link org.hibernate.dialect.Dialect} is
-	 * instantiated before Hibernate property resolution.
+	 * multiple storage engines.
+	 *
+	 * This property can be set as an {@link Environment} variable, a JVM System Property
+	 * or a configuration property.
 	 * <p>
 	 * For MySQL, the legal values are {@code innodb} (the default) and {@code myisam}.
 	 *

hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java

@@ -93,6 +93,7 @@
 import java.time.temporal.TemporalAccessor;
 import java.util.Calendar;
 import java.util.Date;
+import java.util.Locale;
 import java.util.TimeZone;
 
 import static java.lang.Integer.parseInt;
@@ -146,7 +147,7 @@ public class MySQLDialect extends Dialect {
 
 	private static final DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 8 );
 
-	private final MySQLStorageEngine storageEngine = createStorageEngine();
+	private final MySQLStorageEngine storageEngine;
 
 	private final SizeStrategy sizeStrategy = new SizeStrategyImpl() {
 		@Override
@@ -207,14 +208,19 @@ public MySQLDialect(DatabaseVersion version, int bytesPerCharacter) {
 	}
 
 	public MySQLDialect(DatabaseVersion version, MySQLServerConfiguration serverConfiguration) {
-		this( version, serverConfiguration.getBytesPerCharacter(), serverConfiguration.isNoBackslashEscapesEnabled() );
+		super( version );
+		maxVarcharLength = maxVarcharLength( getMySQLVersion(), serverConfiguration.getBytesPerCharacter() ); //conservative assumption
+		maxVarbinaryLength = maxVarbinaryLength( getMySQLVersion() );
+		noBackslashEscapesEnabled = serverConfiguration.isNoBackslashEscapesEnabled();
+		storageEngine = createStorageEngine( serverConfiguration.getConfiguredStorageEngine() );
 	}
 
 	public MySQLDialect(DatabaseVersion version, int bytesPerCharacter, boolean noBackslashEscapes) {
 		super( version );
 		maxVarcharLength = maxVarcharLength( getMySQLVersion(), bytesPerCharacter ); //conservative assumption
 		maxVarbinaryLength = maxVarbinaryLength( getMySQLVersion() );
 		noBackslashEscapesEnabled = noBackslashEscapes;
+		storageEngine = createStorageEngine( Environment.getProperties().getProperty( AvailableSettings.STORAGE_ENGINE ) );
 	}
 
 	public MySQLDialect(DialectResolutionInfo info) {
@@ -257,13 +263,10 @@ protected void initDefaultProperties() {
 		getDefaultProperties().setProperty( FetchSettings.MAX_FETCH_DEPTH, "2" );
 	}
 
-	private MySQLStorageEngine createStorageEngine() {
-		final String storageEngine =
-				Environment.getProperties()
-						.getProperty( AvailableSettings.STORAGE_ENGINE );
-		return storageEngine == null
+	private MySQLStorageEngine createStorageEngine(String configuredStorageEngine) {
+		return configuredStorageEngine == null
 				? getDefaultMySQLStorageEngine()
-				: switch ( storageEngine ) {
+				: switch ( configuredStorageEngine.toLowerCase(Locale.ROOT) ) {
 					case "innodb" -> InnoDBStorageEngine.INSTANCE;
 					case "myisam" -> MyISAMStorageEngine.INSTANCE;
 					default -> throw new UnsupportedOperationException(

hibernate-core/src/main/java/org/hibernate/dialect/MySQLServerConfiguration.java

@@ -9,7 +9,9 @@
 import java.sql.SQLException;
 
 import org.hibernate.Internal;
+import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.engine.jdbc.dialect.spi.DialectResolutionInfo;
+import org.hibernate.internal.util.config.ConfigurationHelper;
 
 import static org.hibernate.cfg.DialectSpecificSettings.MYSQL_BYTES_PER_CHARACTER;
 import static org.hibernate.cfg.DialectSpecificSettings.MYSQL_NO_BACKSLASH_ESCAPES;
@@ -26,10 +28,18 @@
 public class MySQLServerConfiguration {
 	private final int bytesPerCharacter;
 	private final boolean noBackslashEscapesEnabled;
+	private final String storageEngine;
 
 	public MySQLServerConfiguration(int bytesPerCharacter, boolean noBackslashEscapesEnabled) {
 		this.bytesPerCharacter = bytesPerCharacter;
 		this.noBackslashEscapesEnabled = noBackslashEscapesEnabled;
+		this.storageEngine = null;
+	}
+
+	public MySQLServerConfiguration(int bytesPerCharacter, boolean noBackslashEscapesEnabled, String storageEngine) {
+		this.bytesPerCharacter = bytesPerCharacter;
+		this.noBackslashEscapesEnabled = noBackslashEscapesEnabled;
+		this.storageEngine = storageEngine;
 	}
 
 	public int getBytesPerCharacter() {
@@ -40,6 +50,10 @@ public boolean isNoBackslashEscapesEnabled() {
 		return noBackslashEscapesEnabled;
 	}
 
+	public String getConfiguredStorageEngine() {
+		return storageEngine;
+	}
+
 	static Integer getBytesPerCharacter(String characterSet) {
 		final int collationIndex = characterSet.indexOf( '_' );
 		// According to https://dev.mysql.com/doc/refman/8.0/en/charset-charsets.html
@@ -78,7 +92,11 @@ public static MySQLServerConfiguration fromDialectResolutionInfo(DialectResoluti
 		if ( noBackslashEscapes == null ) {
 			noBackslashEscapes = getBoolean( MYSQL_NO_BACKSLASH_ESCAPES, info.getConfigurationValues() );
 		}
-		return new MySQLServerConfiguration( bytesPerCharacter, noBackslashEscapes );
+
+		return new MySQLServerConfiguration(
+				bytesPerCharacter,
+				noBackslashEscapes,
+				ConfigurationHelper.getString( AvailableSettings.STORAGE_ENGINE, info.getConfigurationValues() ) );
 	}
 
 	/**