Fix multiple dialect skips for same class but different version

Author: beikov

hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFilterExtension.java

@@ -8,8 +8,10 @@
 import java.util.LinkedHashMap;
 import java.util.Locale;
 
+import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
 
+import org.hibernate.dialect.SimpleDatabaseVersion;
 import org.junit.jupiter.api.extension.ConditionEvaluationResult;
 import org.junit.jupiter.api.extension.ExecutionCondition;
 import org.junit.jupiter.api.extension.ExtensionContext;
@@ -181,27 +183,46 @@ public enum VersionMatchMode {
 		SAME_OR_OLDER
 	}
 
+	record DialectVersionKey(Class<? extends Dialect> dialect, DatabaseVersion version) {
+		public static DialectVersionKey of(SkipForDialect annotation) {
+			final Class<? extends Dialect> dialectClass = annotation.dialectClass();
+			int majorVersion = DatabaseVersion.NO_VERSION;
+			int minorVersion = DatabaseVersion.NO_VERSION;
+			int microVersion = DatabaseVersion.NO_VERSION;
+			if ( annotation.majorVersion() != -1 ) {
+				majorVersion = annotation.majorVersion();
+				if ( annotation.minorVersion() != -1 ) {
+					minorVersion += annotation.minorVersion();
+					if ( annotation.microVersion() != -1 ) {
+						microVersion += annotation.microVersion();
+					}
+				}
+			}
+			return new DialectVersionKey( dialectClass, new SimpleDatabaseVersion( majorVersion, minorVersion, microVersion ) );
+		}
+	}
+
 	private ConditionEvaluationResult evaluateSkipConditions(ExtensionContext context, Dialect dialect, String enabledResult) {
 		final Collection<SkipForDialect> effectiveSkips = TestingUtil.collectAnnotations(
 				context,
 				SkipForDialect.class,
 				SkipForDialectGroup.class,
 				(methodAnnotation, methodAnnotations, classAnnotation, classAnnotations) -> {
-					final LinkedHashMap<Class<?>, SkipForDialect> map = new LinkedHashMap<>();
+					final LinkedHashMap<DialectVersionKey, SkipForDialect> map = new LinkedHashMap<>();
 					if ( classAnnotation != null ) {
-						map.put( classAnnotation.dialectClass(), classAnnotation );
+						map.put( DialectVersionKey.of( classAnnotation ), classAnnotation );
 					}
 					if ( classAnnotations != null ) {
 						for ( SkipForDialect annotation : classAnnotations ) {
-							map.put( annotation.dialectClass(), annotation );
+							map.put( DialectVersionKey.of( annotation ), annotation );
 						}
 					}
 					if ( methodAnnotation != null ) {
-						map.put( methodAnnotation.dialectClass(), methodAnnotation );
+						map.put( DialectVersionKey.of( methodAnnotation ), methodAnnotation );
 					}
 					if ( methodAnnotations != null ) {
 						for ( SkipForDialect annotation : methodAnnotations ) {
-							map.put( annotation.dialectClass(), annotation );
+							map.put( DialectVersionKey.of( annotation ), annotation );
 						}
 					}
 					return map.values();