Skip to content

Commit

Permalink
HHH-18112 Fix and test default version handling for non-Oracle dialects
Browse files Browse the repository at this point in the history
  • Loading branch information
@yrodiere
yrodiere committed May 15, 2024
1 parent a7cbd1a commit dfbb72a
Show file tree
Hide file tree
Showing 7 changed files with 96 additions and 27 deletions.
6 changes: 5 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/dialect/H2Dialect.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,11 @@ public H2Dialect(DatabaseVersion version) {
}

private static DatabaseVersion parseVersion(DialectResolutionInfo info) {
return DatabaseVersion.make( info.getMajor(), info.getMinor(), parseBuildId( info ) );
DatabaseVersion version = info.makeCopyOrDefault( MINIMUM_VERSION );
if ( info.getDatabaseVersion() != null ) {
version = DatabaseVersion.make( version.getMajor(), version.getMinor(), parseBuildId( info ) );
}
return version;
}

private static int parseBuildId(DialectResolutionInfo info) {
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/dialect/HANADialect.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
@SuppressWarnings("removal")
public class HANADialect extends AbstractHANADialect {

private static final DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 1, 0, 120 );
static final DatabaseVersion MINIMUM_VERSION = DatabaseVersion.make( 1, 0, 120 );

public HANADialect(DialectResolutionInfo info) {
this( HANAServerConfiguration.fromDialectResolutionInfo( info ), true );
Expand Down
3 changes: 3 additions & 0 deletions hibernate-core/src/main/java/org/hibernate/dialect/HANAServerConfiguration.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -83,6 +83,9 @@ private static DatabaseVersion createVersion(DialectResolutionInfo info) {
int majorVersion = 1;
int minorVersion = 0;
int patchLevel = 0;
if ( versionString == null ) {
return HANADialect.MINIMUM_VERSION;
}
final String[] components = versionString.split( "\\." );
if ( components.length >= 3 ) {
try {
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/dialect/MariaDBDialect.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ public MariaDBDialect(DatabaseVersion version) {
}

public MariaDBDialect(DialectResolutionInfo info) {
super( createVersion( info ), MySQLServerConfiguration.fromDialectResolutionInfo( info ) );
super( createVersion( info, MINIMUM_VERSION ), MySQLServerConfiguration.fromDialectResolutionInfo( info ) );
registerKeywords( info );
}

Expand Down
7 changes: 6 additions & 1 deletion hibernate-core/src/main/java/org/hibernate/dialect/MySQLDialect.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -191,7 +191,12 @@ public MySQLDialect(DialectResolutionInfo info) {
registerKeywords( info );
}

@Deprecated
protected static DatabaseVersion createVersion(DialectResolutionInfo info) {
return createVersion( info, MINIMUM_VERSION );
}

protected static DatabaseVersion createVersion(DialectResolutionInfo info, DatabaseVersion defaultVersion) {
final String versionString = info.getDatabaseVersion();
if ( versionString != null ) {
final String[] components = versionString.split( "\\." );
Expand All @@ -207,7 +212,7 @@ protected static DatabaseVersion createVersion(DialectResolutionInfo info) {
}
}
}
return info.makeCopyOrDefault( MINIMUM_VERSION );
return info.makeCopyOrDefault( defaultVersion );
}

@Override
Expand Down
2 changes: 1 addition & 1 deletion hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -153,7 +153,7 @@ public PostgreSQLDialect() {
}

public PostgreSQLDialect(DialectResolutionInfo info) {
this( info, PostgreSQLDriverKind.determineKind( info ) );
this( info.makeCopyOrDefault( MINIMUM_VERSION ), PostgreSQLDriverKind.determineKind( info ) );
registerKeywords( info );
}

Expand Down
101 changes: 79 additions & 22 deletions ...core/src/test/java/org/hibernate/orm/test/boot/database/metadata/MetadataAccessTests.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -6,15 +6,33 @@
*/
package org.hibernate.orm.test.boot.database.metadata;

import static org.assertj.core.api.Assertions.assertThat;
import static org.hibernate.dialect.SimpleDatabaseVersion.ZERO_VERSION;
import static org.junit.jupiter.api.Assertions.fail;

import java.lang.reflect.Field;
import java.util.stream.Stream;

import org.hibernate.HibernateException;
import org.hibernate.boot.registry.StandardServiceRegistry;
import org.hibernate.boot.registry.StandardServiceRegistryBuilder;
import org.hibernate.cfg.AvailableSettings;
import org.hibernate.cfg.JdbcSettings;
import org.hibernate.dialect.DB2Dialect;
import org.hibernate.dialect.DatabaseVersion;
import org.hibernate.dialect.DerbyDialect;
import org.hibernate.dialect.Dialect;
import org.hibernate.dialect.H2Dialect;
import org.hibernate.dialect.HANADialect;
import org.hibernate.dialect.HSQLDialect;
import org.hibernate.dialect.MariaDBDialect;
import org.hibernate.dialect.MySQLDialect;
import org.hibernate.dialect.OracleDialect;
import org.hibernate.dialect.PostgreSQLDialect;
import org.hibernate.dialect.PostgresPlusDialect;
import org.hibernate.dialect.SQLServerDialect;
import org.hibernate.dialect.SpannerDialect;
import org.hibernate.dialect.SybaseDialect;
import org.hibernate.engine.jdbc.env.spi.JdbcEnvironment;
import org.hibernate.internal.CoreMessageLogger;
import org.hibernate.service.spi.ServiceException;
Expand All @@ -26,9 +44,9 @@
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
import org.junit.jupiter.api.extension.RegisterExtension;

import static org.assertj.core.api.Assertions.assertThat;
import static org.junit.jupiter.api.Assertions.fail;
import org.junit.jupiter.params.ParameterizedTest;
import org.junit.jupiter.params.provider.Arguments;
import org.junit.jupiter.params.provider.MethodSource;

import org.jboss.logging.Logger;

Expand Down Expand Up @@ -76,47 +94,87 @@ void testAccessAllowed() {
assertThat( dialect ).isNotNull();
assertThat( dialect ).isInstanceOf( H2Dialect.class );
}

assertThat( triggerable.triggerMessages() )
.as( triggerable.toString() )
.isEmpty();
}

@Test
void testAccessDisabledExplicitDialect() {
static Stream<Arguments> dialects() {
return Stream.of(
Arguments.of( "DB2", DB2Dialect.class,
getVersionConstant( DB2Dialect.class, "MINIMUM_VERSION") ),
Arguments.of( "Apache Derby", DerbyDialect.class,
getVersionConstant( DerbyDialect.class, "MINIMUM_VERSION") ),
Arguments.of( "EnterpriseDB", PostgresPlusDialect.class,
getVersionConstant( PostgreSQLDialect.class, "MINIMUM_VERSION") ),
Arguments.of( "H2", H2Dialect.class,
getVersionConstant( H2Dialect.class, "MINIMUM_VERSION") ),
Arguments.of( "HSQL Database Engine", HSQLDialect.class,
getVersionConstant( HSQLDialect.class, "MINIMUM_VERSION") ),
Arguments.of( "HDB", HANADialect.class,
getVersionConstant( HANADialect.class, "MINIMUM_VERSION") ),
Arguments.of( "MariaDB", MariaDBDialect.class,
getVersionConstant( MariaDBDialect.class, "MINIMUM_VERSION") ),
Arguments.of( "MySQL", MySQLDialect.class,
getVersionConstant( MySQLDialect.class, "MINIMUM_VERSION") ),
Arguments.of( "Oracle", OracleDialect.class,
getVersionConstant( OracleDialect.class, "MINIMUM_VERSION") ),
Arguments.of( "PostgreSQL", PostgreSQLDialect.class,
getVersionConstant( PostgreSQLDialect.class, "MINIMUM_VERSION") ),
Arguments.of( "Google Cloud Spanner", SpannerDialect.class, ZERO_VERSION ),
Arguments.of( "Microsoft SQL Server", SQLServerDialect.class,
getVersionConstant( SQLServerDialect.class, "MINIMUM_VERSION") ),
Arguments.of( "Sybase SQL Server", SybaseDialect.class,
getVersionConstant( SybaseDialect.class, "MINIMUM_VERSION") ),
Arguments.of( "Adaptive Server Enterprise", SybaseDialect.class,
getVersionConstant( SybaseDialect.class, "MINIMUM_VERSION") ),
Arguments.of( "ASE", SybaseDialect.class,
getVersionConstant( SybaseDialect.class, "MINIMUM_VERSION") )
);
}

@ParameterizedTest
@MethodSource("dialects")
void testAccessDisabledExplicitDialect(String productName, Class<?> dialectClass, DatabaseVersion expectedDatabaseVersion) {
final StandardServiceRegistryBuilder registryBuilder = new StandardServiceRegistryBuilder();
registryBuilder.clearSettings();

registryBuilder.applySetting( JdbcSettings.ALLOW_METADATA_ON_BOOT, false );
registryBuilder.applySetting( JdbcSettings.DIALECT, "org.hibernate.dialect.OracleDialect" );
registryBuilder.applySetting( JdbcSettings.DIALECT, dialectClass.getName() );
assertThat( registryBuilder.getSettings() )
.doesNotContainKeys( JdbcSettings.JAKARTA_HBM2DDL_DB_NAME );

try (StandardServiceRegistry registry = registryBuilder.build()) {
final JdbcEnvironment jdbcEnvironment = registry.getService( JdbcEnvironment.class );
final Dialect dialect = jdbcEnvironment.getDialect();
assertThat( dialect ).isInstanceOf( OracleDialect.class );
assertThat( dialect.getVersion() ).isEqualTo( getOracleMinimumSupportedVersion() );
assertThat( dialect ).isInstanceOf( dialectClass );
assertThat( dialect.getVersion() ).isEqualTo( expectedDatabaseVersion );
}

assertThat( triggerable.triggerMessages() )
.as( triggerable.toString() )
.isEmpty();
}

@Test
@ParameterizedTest
@MethodSource("dialects")
@Jira("https://hibernate.atlassian.net/browse/HHH-18079")
@Jira("https://hibernate.atlassian.net/browse/HHH-18080")
void testAccessDisabledExplicitProductName() {
void testAccessDisabledExplicitProductName(String productName, Class<?> dialectClass, DatabaseVersion expectedDatabaseVersion) {
final StandardServiceRegistryBuilder registryBuilder = new StandardServiceRegistryBuilder();
registryBuilder.clearSettings();

registryBuilder.applySetting( JdbcSettings.ALLOW_METADATA_ON_BOOT, false );
registryBuilder.applySetting( JdbcSettings.JAKARTA_HBM2DDL_DB_NAME, "Oracle" );
registryBuilder.applySetting( JdbcSettings.JAKARTA_HBM2DDL_DB_NAME, productName );
assertThat( registryBuilder.getSettings() )
.doesNotContainKeys( JdbcSettings.DIALECT );

try (StandardServiceRegistry registry = registryBuilder.build()) {
final JdbcEnvironment jdbcEnvironment = registry.getService( JdbcEnvironment.class );
final Dialect dialect = jdbcEnvironment.getDialect();
assertThat( dialect ).isInstanceOf( OracleDialect.class );
assertThat( dialect.getVersion() ).isEqualTo( getOracleMinimumSupportedVersion() );
assertThat( dialect ).isInstanceOf( dialectClass );
assertThat( dialect.getVersion() ).isEqualTo( expectedDatabaseVersion );
}

assertThat( triggerable.triggerMessages() )
Expand Down Expand Up @@ -147,15 +205,14 @@ void testAccessDisabledNoDialectNorProductName() {

// Ugly hack because neither MINIMUM_VERSION nor getMinimumSupportedVersion()
// can be accessed from this test.
private Object getOracleMinimumSupportedVersion() {
return new OracleDialect() {
// Change access from protected to public
@Override
public DatabaseVersion getMinimumSupportedVersion() {
return super.getMinimumSupportedVersion();
}
private static DatabaseVersion getVersionConstant(Class<? extends Dialect> dialectClass, String versionConstantName) {
try {
Field field = dialectClass.getDeclaredField( versionConstantName );
field.setAccessible( true );
return (DatabaseVersion) field.get( null );
}
catch (IllegalAccessException | NoSuchFieldException e) {
throw new RuntimeException( "Error extracting '" + versionConstantName + "' from '" + dialectClass + "'", e );
}
// Call the now-accessible method
.getMinimumSupportedVersion();
}
}

0 comments on commit dfbb72a

Please sign in to comment.