Hibernate
/
hibernate-orm
mirror of https://github.com/hibernate/hibernate-orm
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Allow skipping dialect versions even when using `@RequiresDialect`

This commit is contained in:
Christian Beikov 2022-01-06 18:29:29 +01:00
parent 0fb19fd4fb
commit ad43a625ae
1 changed files with 44 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -81,7 +81,7 @@ public class DialectFilterExtension implements ExecutionCondition {
} }
if ( requiresDialect.matchSubTypes() || requiresDialect.value().equals( dialect.getClass() ) ) { if ( requiresDialect.matchSubTypes() || requiresDialect.value().equals( dialect.getClass() ) ) {
return ConditionEvaluationResult.enabled( "Matched @RequiresDialect" ); return evaluateSkipConditions( context, dialect, "Matched @RequiresDialect" );
} }
} }
@ -96,6 +96,48 @@ public class DialectFilterExtension implements ExecutionCondition {
); );
} }
return evaluateSkipConditions( context, dialect, "Passed all @SkipForDialects" );
}
private String matchingVersionString(int matchingMajorVersion, int matchingMinorVersion, int matchingMicroVersion) {
final StringBuilder buffer = new StringBuilder( matchingMajorVersion );
if ( matchingMajorVersion > 0 ) {
buffer.append( "." ).append( matchingMinorVersion );
if ( matchingMicroVersion > 0 ) {
buffer.append( "." ).append( matchingMicroVersion );
}
}
return buffer.toString();
}
private boolean versionsMatch(
int matchingMajorVersion,
int matchingMinorVersion,
int matchingMicroVersion,
Dialect dialect,
boolean matchNewerVersions) {
if ( matchingMajorVersion < 0 ) {
return false;
}
if ( matchingMinorVersion < 0 ) {
matchingMinorVersion = 0;
}
if ( matchingMicroVersion < 0 ) {
matchingMicroVersion = 0;
}
if ( matchNewerVersions ) {
return dialect.getVersion().isSameOrAfter( matchingMajorVersion, matchingMinorVersion, matchingMicroVersion );
}
else {
return dialect.getVersion().isSame( matchingMajorVersion );
}
}
private ConditionEvaluationResult evaluateSkipConditions(ExtensionContext context, Dialect dialect, String enabledResult) {
final List<SkipForDialect> effectiveSkips = TestingUtil.findEffectiveRepeatingAnnotation( final List<SkipForDialect> effectiveSkips = TestingUtil.findEffectiveRepeatingAnnotation(
context, context,
SkipForDialect.class, SkipForDialect.class,
@ -165,46 +207,7 @@ public class DialectFilterExtension implements ExecutionCondition {
throw new RuntimeException( "Unable to instantiate DialectFeatureCheck class", e ); throw new RuntimeException( "Unable to instantiate DialectFeatureCheck class", e );
} }
} }
return ConditionEvaluationResult.enabled( enabledResult );
return ConditionEvaluationResult.enabled( "Passed all @SkipForDialects" );
}
private String matchingVersionString(int matchingMajorVersion, int matchingMinorVersion, int matchingMicroVersion) {
final StringBuilder buffer = new StringBuilder( matchingMajorVersion );
if ( matchingMajorVersion > 0 ) {
buffer.append( "." ).append( matchingMinorVersion );
if ( matchingMicroVersion > 0 ) {
buffer.append( "." ).append( matchingMicroVersion );
}
}
return buffer.toString();
}
private boolean versionsMatch(
int matchingMajorVersion,
int matchingMinorVersion,
int matchingMicroVersion,
Dialect dialect,
boolean matchNewerVersions) {
if ( matchingMajorVersion < 0 ) {
return false;
}
if ( matchingMinorVersion < 0 ) {
matchingMinorVersion = 0;
}
if ( matchingMicroVersion < 0 ) {
matchingMicroVersion = 0;
}
if ( matchNewerVersions ) {
return dialect.getVersion().isSameOrAfter( matchingMajorVersion, matchingMinorVersion, matchingMicroVersion );
}
else {
return dialect.getVersion().isSame( matchingMajorVersion );
}
} }
private Dialect getDialect(ExtensionContext context) { private Dialect getDialect(ExtensionContext context) {