Applied Suggested Changes from Code Review

VladoKuruc · VladoKuruc · commit 7f67e1d82618 · 2025-08-07T17:45:25.000+02:00
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/filter/DynamicFilterTest.java
@@ -23,15 +23,13 @@
 import org.hibernate.cache.spi.access.CollectionDataAccess;
 import org.hibernate.cache.spi.entry.CollectionCacheEntry;
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.persister.collection.CollectionPersister;
 import org.hibernate.query.Query;
 
 import org.hibernate.testing.DialectChecks;
 import org.hibernate.testing.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.JiraKey;
 import org.hibernate.testing.junit4.BaseNonConfigCoreFunctionalTestCase;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Test;
@@ -685,7 +683,7 @@ public void testFilterApplicationOnHqlQueryWithImplicitSubqueryContainingNamedPa
 	}
 
 	@Test
-	@SkipForDialect( dialectClass = InformixDialect.class, majorVersion = 12, matchSubTypes = true, reason = "Informix does not support table alliases in update/delete statements, Issue HHH-18473")
+	@RequiresDialectFeature(DialectChecks.SupportsDmlTargetColumnQualifier.class)
 	public void testFiltersOnSimpleHqlDelete() {
 		Salesperson sp = new Salesperson();
 		Salesperson sp2 = new Salesperson();
@@ -711,7 +709,7 @@ public void testFiltersOnSimpleHqlDelete() {
 	}
 
 	@Test
-	@SkipForDialect( dialectClass = InformixDialect.class, majorVersion = 12, matchSubTypes = true, reason = "Informix does not support table alliases in update/delete statements, Issue HHH-18473")
+	@RequiresDialectFeature(DialectChecks.SupportsDmlTargetColumnQualifier.class)
 	public void testFiltersOnMultiTableHqlDelete() {
 		Salesperson sp = new Salesperson();
 		Salesperson sp2 = new Salesperson();
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BooleanMappingTests.java b/hibernate-core/src/test/java/org/hibernate/orm/test/mapping/basic/BooleanMappingTests.java
@@ -315,7 +315,7 @@ public void testNegatedCriteriaUsage(SessionFactoryScope scope) {
 	private int countByCriteria(String attributeName, boolean matchValue, SessionImplementor session) {
 		final HibernateCriteriaBuilder builder = session.getCriteriaBuilder();
 		final JpaCriteriaQuery<Long> criteria = builder.createQuery( Long.class );
-		criteria.select( builder.count( builder.literal( "*" ) ) );
+		criteria.select( builder.count() );
 		final JpaRoot<EntityOfBooleans> root = criteria.from( EntityOfBooleans.class );
 		final JpaPath<Boolean> convertedYesNo = root.get( attributeName );
 		if ( matchValue ) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java
@@ -10,8 +10,8 @@
 import java.util.Map;
 
 import org.hibernate.cfg.AvailableSettings;
-import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.dialect.AbstractTransactSQLDialect;
+import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.SybaseDialect;
 import org.hibernate.engine.jdbc.connections.spi.ConnectionProvider;
@@ -79,8 +79,7 @@ else if ( DialectContext.getDialect() instanceof SybaseDialect ) {
 		else if ( DialectContext.getDialect() instanceof AbstractTransactSQLDialect ) {
 			baseQuery = "update ae1_0 set name=? from AnEntity ae1_0";
 		}
-		else if (DialectContext.getDialect() instanceof InformixDialect && DialectContext.getDialect().getVersion()
-				.isBefore(12, 10)) {
+		else if ( DialectContext.getDialect().getDmlTargetColumnQualifierSupport() == DmlTargetColumnQualifierSupport.NONE ) {
 			baseQuery = "update AnEntity set name=?";
 		}
 		else {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesFilterTest.java
@@ -8,15 +8,15 @@
 
 import org.hibernate.annotations.Filter;
 import org.hibernate.annotations.FilterDef;
-import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.query.MutationQuery;
 
 import org.hibernate.testing.jdbc.SQLStatementInspector;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Column;
@@ -49,7 +49,7 @@
 		MutationQueriesFilterTest.RoleEntity.class
 } )
 @Jira( "https://hibernate.atlassian.net/browse/HHH-16392" )
-@SkipForDialect( dialectClass = InformixDialect.class, majorVersion = 12, matchSubTypes = true, reason = "Informix does not support table alliases in update/delete statements, Issue HHH-18473")
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsDmlTargetColumnQualifier.class )
 public class MutationQueriesFilterTest {
 	@Test
 	public void testDelete(SessionFactoryScope scope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesWhereAndFilterTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesWhereAndFilterTest.java
@@ -9,15 +9,15 @@
 import org.hibernate.annotations.Filter;
 import org.hibernate.annotations.FilterDef;
 import org.hibernate.annotations.SQLRestriction;
-import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.query.MutationQuery;
 
 import org.hibernate.testing.jdbc.SQLStatementInspector;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Column;
@@ -50,7 +50,7 @@
 		MutationQueriesWhereAndFilterTest.RoleEntity.class
 } )
 @Jira( "https://hibernate.atlassian.net/browse/HHH-16392" )
-@SkipForDialect( dialectClass = InformixDialect.class, majorVersion = 12, matchSubTypes = true, reason = "Informix does not support table alliases in update/delete statements, Issue HHH-18473")
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsDmlTargetColumnQualifier.class )
 public class MutationQueriesWhereAndFilterTest {
 	@Test
 	public void testDelete(SessionFactoryScope scope) {
diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesWhereTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/mutationquery/MutationQueriesWhereTest.java
@@ -7,15 +7,15 @@
 import java.util.List;
 
 import org.hibernate.annotations.SQLRestriction;
-import org.hibernate.community.dialect.InformixDialect;
 import org.hibernate.query.MutationQuery;
 
 import org.hibernate.testing.jdbc.SQLStatementInspector;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
 import org.hibernate.testing.orm.junit.DomainModel;
 import org.hibernate.testing.orm.junit.Jira;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.testing.orm.junit.SessionFactory;
 import org.hibernate.testing.orm.junit.SessionFactoryScope;
-import org.hibernate.testing.orm.junit.SkipForDialect;
 import org.junit.jupiter.api.Test;
 
 import jakarta.persistence.Column;
@@ -48,7 +48,7 @@
 		MutationQueriesWhereTest.RoleEntity.class
 } )
 @Jira( "https://hibernate.atlassian.net/browse/HHH-16392" )
-@SkipForDialect( dialectClass = InformixDialect.class, majorVersion = 12, matchSubTypes = true, reason = "Informix does not support table alliases in update/delete statements, Issue HHH-18473")
+@RequiresDialectFeature( feature = DialectFeatureChecks.SupportsDmlTargetColumnQualifier.class )
 public class MutationQueriesWhereTest {
 	@Test
 	public void testDelete(SessionFactoryScope scope) {
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java b/hibernate-testing/src/main/java/org/hibernate/testing/DialectChecks.java
@@ -9,6 +9,7 @@
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.community.dialect.DerbyDialect;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
 import org.hibernate.dialect.HANADialect;
 import org.hibernate.dialect.MySQLDialect;
 import org.hibernate.dialect.NationalizationSupport;
@@ -309,4 +310,11 @@ public boolean isMatch(Dialect dialect) {
 			return dialect.rowId("") != null;
 		}
 	}
+
+	public static class SupportsDmlTargetColumnQualifier implements DialectCheck {
+		@Override
+		public boolean isMatch(Dialect dialect) {
+			return dialect.getDmlTargetColumnQualifierSupport() != DmlTargetColumnQualifierSupport.NONE;
+		}
+	}
 }
diff --git a/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java b/hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java
@@ -49,6 +49,7 @@
 import org.hibernate.dialect.CockroachDialect;
 import org.hibernate.dialect.DB2Dialect;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
 import org.hibernate.dialect.H2Dialect;
 import org.hibernate.dialect.HANADialect;
 import org.hibernate.dialect.HSQLDialect;
@@ -1172,6 +1173,12 @@ public boolean apply(Dialect dialect) {
 		}
 	}
 
+	public static class SupportsDmlTargetColumnQualifier implements DialectFeatureCheck {
+		@Override
+		public boolean apply(Dialect dialect) {
+			return dialect.getDmlTargetColumnQualifierSupport() != DmlTargetColumnQualifierSupport.NONE;
+		}
+	}
 
 	private static SqmFunctionRegistry getSqmFunctionRegistry(Dialect dialect) {
 		SqmFunctionRegistry sqmFunctionRegistry = FUNCTION_REGISTRIES.get( dialect );

Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,7 @@`
`9`	`9`	`import org.hibernate.dialect.DB2Dialect;`
`10`	`10`	`import org.hibernate.community.dialect.DerbyDialect;`
`11`	`11`	`import org.hibernate.dialect.Dialect;`
	`12`	`+import org.hibernate.dialect.DmlTargetColumnQualifierSupport;`
`12`	`13`	`import org.hibernate.dialect.HANADialect;`
`13`	`14`	`import org.hibernate.dialect.MySQLDialect;`
`14`	`15`	`import org.hibernate.dialect.NationalizationSupport;`
`@@ -309,4 +310,11 @@ public boolean isMatch(Dialect dialect) {`
`309`	`310`	`return dialect.rowId("") != null;`
`310`	`311`	`}`
`311`	`312`	`}`
	`313`	`+`
	`314`	`+ public static class SupportsDmlTargetColumnQualifier implements DialectCheck {`
	`315`	`+ @Override`
	`316`	`+ public boolean isMatch(Dialect dialect) {`
	`317`	`+ return dialect.getDmlTargetColumnQualifierSupport() != DmlTargetColumnQualifierSupport.NONE;`
	`318`	`+ }`
	`319`	`+ }`
`312`	`320`	`}`