HHH-19694 Enhanced support for older Informix

VladoKuruc · yrodiere · commit f209ea628099 · 2025-10-06T13:46:57.000+02:00
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java
@@ -473,7 +473,7 @@ protected <T extends JdbcOperation> SqlAstTranslator<T> buildTranslator(
 	@Override
 	public String extractPattern(TemporalUnit unit) {
 		return switch ( unit ) {
-			case SECOND -> "to_number(to_char(?2,'%S.%F3'))";
+			case SECOND -> getVersion().isBefore( 11, 70 ) ?	"to_number(to_char(?2,'%S%F3'))" : "to_number(to_char(?2,'%S.%F3'))";
 			case MINUTE -> "to_number(to_char(?2,'%M'))";
 			case HOUR -> "to_number(to_char(?2,'%H'))";
 			case DAY_OF_WEEK -> "(weekday(?2)+1)";
@@ -543,8 +543,8 @@ public String getAddPrimaryKeyConstraintString(String constraintName) {
 
 	@Override
 	public String getTruncateTableStatement(String tableName) {
-		return super.getTruncateTableStatement( tableName )
-			+ " reuse storage keep statistics";
+		return super.getTruncateTableStatement( tableName ) + " reuse storage"
+				+ ( getVersion().isSameOrAfter( 12, 10 ) ? " keep statistics" : "" );
 	}
 
 	@Override
@@ -778,7 +778,7 @@ public boolean isCurrentTimestampSelectStringCallable() {
 
 	@Override
 	public String getCurrentTimestampSelectString() {
-		return "select sysdate";
+		return "select sysdate" + (getVersion().isBefore( 12, 10 ) ? " from informix.systables where tabid=1" : "");
 	}
 
 	@Override @SuppressWarnings("deprecation")
@@ -1138,11 +1138,26 @@ public String getDual() {
 		return "(select 0 from systables where tabid=1)";
 	}
 
+	@Override
+	public String getFromDualForSelectOnly() {
+		return getVersion().isBefore( 12,10 ) ?	" from " + getDual() + " dual" : "";
+	}
+
 	@Override
 	public boolean supportsCrossJoin() {
 		return false;
 	}
 
+	@Override
+	public boolean supportsIntersect(){
+		return getVersion().isSameOrAfter( 12,10 );
+	}
+
+	public boolean supportsSubqueryOnMutatingTable() {
+		//tested on version 11.50, 14.10
+		return getVersion().isAfter( 11, 50);
+	}
+
 	@Override
 	public boolean supportsRowValueConstructorSyntax() {
 		return false;
@@ -1158,6 +1173,11 @@ public boolean supportsRowValueConstructorSyntaxInInList() {
 		return false;
 	}
 
+	@Override
+	public boolean supportsWithClause() {
+		return getVersion().isSameOrAfter( 14,10 );
+	}
+
 	@Override
 	public boolean requiresColumnListInCreateView() {
 		return true;
@@ -1174,6 +1194,6 @@ public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, @
 
 	@Override
 	public DmlTargetColumnQualifierSupport getDmlTargetColumnQualifierSupport() {
-		return DmlTargetColumnQualifierSupport.TABLE_ALIAS;
+		return getVersion().isSameOrAfter( 12,10 ) ? DmlTargetColumnQualifierSupport.TABLE_ALIAS : DmlTargetColumnQualifierSupport.NONE;
 	}
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqlAstTranslator.java
@@ -50,7 +50,8 @@ protected void visitQueryClauses(QuerySpec querySpec) {
 		visitSelectClause( querySpec.getSelectClause() );
 		visitFromClause( querySpec.getFromClause() );
 		if ( !hasFrom( querySpec.getFromClause() )
-				&& hasWhere( querySpec.getWhereClauseRestrictions() ) ) {
+				&& hasWhere( querySpec.getWhereClauseRestrictions() )
+				&& getDialect().getFromDualForSelectOnly().isBlank() ) {
 			append( " from " );
 			append( getDual() );
 		}
@@ -321,8 +322,10 @@ public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeti
 	@Override
 	protected void renderDmlTargetTableExpression(NamedTableReference tableReference) {
 		super.renderDmlTargetTableExpression( tableReference );
-		if ( getClauseStack().getCurrent() != Clause.INSERT ) {
-			renderTableReferenceIdentificationVariable( tableReference );
+		if (getDialect().getVersion().isSameOrAfter( 12, 10 )) {
+			if ( getClauseStack().getCurrent() != Clause.INSERT ) {
+				renderTableReferenceIdentificationVariable( tableReference );
+			}
 		}
 	}
 
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
@@ -683,6 +683,7 @@ public void testFilterApplicationOnHqlQueryWithImplicitSubqueryContainingNamedPa
 	}
 
 	@Test
+	@RequiresDialectFeature(DialectChecks.SupportsDmlTargetColumnQualifier.class)
 	public void testFiltersOnSimpleHqlDelete() {
 		Salesperson sp = new Salesperson();
 		Salesperson sp2 = new Salesperson();
@@ -708,6 +709,7 @@ public void testFiltersOnSimpleHqlDelete() {
 	}
 
 	@Test
+	@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/query/QueryTimeOutTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/query/QueryTimeOutTest.java
@@ -11,6 +11,7 @@
 
 import org.hibernate.cfg.AvailableSettings;
 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;
@@ -78,6 +79,9 @@ 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().getDmlTargetColumnQualifierSupport() == DmlTargetColumnQualifierSupport.NONE ) {
+			baseQuery = "update AnEntity set name=?";
+		}
 		else {
 			baseQuery = "update AnEntity ae1_0 set name=?";
 		}
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
@@ -11,8 +11,10 @@
 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.junit.jupiter.api.Test;
@@ -47,6 +49,7 @@
 		MutationQueriesFilterTest.RoleEntity.class
 } )
 @Jira( "https://hibernate.atlassian.net/browse/HHH-16392" )
+@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
@@ -12,8 +12,10 @@
 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.junit.jupiter.api.Test;
@@ -48,6 +50,7 @@
 		MutationQueriesWhereAndFilterTest.RoleEntity.class
 } )
 @Jira( "https://hibernate.atlassian.net/browse/HHH-16392" )
+@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
@@ -10,8 +10,10 @@
 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.junit.jupiter.api.Test;
@@ -46,6 +48,7 @@
 		MutationQueriesWhereTest.RoleEntity.class
 } )
 @Jira( "https://hibernate.atlassian.net/browse/HHH-16392" )
+@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
@@ -51,6 +51,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;
@@ -1321,6 +1322,13 @@ 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) {
 		return getFunctionContributions( dialect ).functionRegistry;
 	}

Original file line number	Diff line number	Diff line change
`@@ -683,6 +683,7 @@ public void testFilterApplicationOnHqlQueryWithImplicitSubqueryContainingNamedPa`
`683`	`683`	`}`
`684`	`684`
`685`	`685`	`@Test`
	`686`	`+ @RequiresDialectFeature(DialectChecks.SupportsDmlTargetColumnQualifier.class)`
`686`	`687`	`public void testFiltersOnSimpleHqlDelete() {`
`687`	`688`	`Salesperson sp = new Salesperson();`
`688`	`689`	`Salesperson sp2 = new Salesperson();`
`@@ -708,6 +709,7 @@ public void testFiltersOnSimpleHqlDelete() {`
`708`	`709`	`}`
`709`	`710`
`710`	`711`	`@Test`
	`712`	`+ @RequiresDialectFeature(DialectChecks.SupportsDmlTargetColumnQualifier.class)`
`711`	`713`	`public void testFiltersOnMultiTableHqlDelete() {`
`712`	`714`	`Salesperson sp = new Salesperson();`
`713`	`715`	`Salesperson sp2 = new Salesperson();`
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`	`}`