functional improvements to InformixSqlAstTranslator

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseDialect.java

@@ -590,6 +590,11 @@ public boolean supportsOuterJoinForUpdate() {
 		return false;
 	}
 
+	@Override
+	public boolean supportsCrossJoin() {
+		return false;
+	}
+
 	@Override
 	public SequenceSupport getSequenceSupport() {
 		return AltibaseSequenceSupport.INSTANCE;

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/AltibaseSqlAstTranslator.java

@@ -12,7 +12,6 @@
 import org.hibernate.query.common.FrameExclusion;
 import org.hibernate.query.common.FrameKind;
 import org.hibernate.sql.ast.Clause;
-import org.hibernate.sql.ast.SqlAstJoinType;
 import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator;
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.ast.tree.delete.DeleteStatement;
@@ -21,14 +20,11 @@
 import org.hibernate.sql.ast.tree.expression.FunctionExpression;
 import org.hibernate.sql.ast.tree.expression.Literal;
 import org.hibernate.sql.ast.tree.expression.Over;
-import org.hibernate.sql.ast.tree.expression.QueryLiteral;
 import org.hibernate.sql.ast.tree.expression.Summarization;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.from.QueryPartTableReference;
-import org.hibernate.sql.ast.tree.from.TableGroupJoin;
 import org.hibernate.sql.ast.tree.from.ValuesTableReference;
 import org.hibernate.sql.ast.tree.insert.InsertSelectStatement;
-import org.hibernate.sql.ast.tree.predicate.BooleanExpressionPredicate;
 import org.hibernate.sql.ast.tree.predicate.Predicate;
 import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
@@ -95,31 +91,6 @@ protected boolean shouldEmulateFetchClause(QueryPart queryPart) {
 				&& getDialect().supportsWindowFunctions() && !isRowsOnlyFetchClauseType( queryPart );
 	}
 
-	@Override
-	protected void renderTableGroupJoin(TableGroupJoin tableGroupJoin, List<TableGroupJoin> tableGroupJoinCollector) {
-		// Use join instead because Altibase does not support cross apply
-		appendSql( WHITESPACE );
-		if ( tableGroupJoin.getJoinType() != SqlAstJoinType.CROSS ) {
-			// No support for cross joins, so we emulate it with an inner join and always true on condition
-			appendSql( tableGroupJoin.getJoinType().getText() );
-		}
-		appendSql( "join " );
-
-		final Predicate predicate;
-		if ( tableGroupJoin.getPredicate() == null ) {
-			predicate = new BooleanExpressionPredicate( new QueryLiteral<>( true, getBooleanType() ) );
-		}
-		else {
-			predicate = tableGroupJoin.getPredicate();
-		}
-		if ( predicate != null && !predicate.isEmpty() ) {
-			renderTableGroup( tableGroupJoin.getJoinedGroup(), predicate, tableGroupJoinCollector );
-		}
-		else {
-			renderTableGroup( tableGroupJoin.getJoinedGroup(), null, tableGroupJoinCollector );
-		}
-	}
-
 	@Override
 	protected void renderPartitionItem(Expression expression) {
 		if ( expression instanceof Literal ) {

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixDialect.java

@@ -24,6 +24,7 @@
 import org.hibernate.community.dialect.unique.InformixUniqueDelegate;
 import org.hibernate.dialect.DatabaseVersion;
 import org.hibernate.dialect.Dialect;
+import org.hibernate.dialect.DmlTargetColumnQualifierSupport;
 import org.hibernate.dialect.NullOrdering;
 import org.hibernate.dialect.Replacer;
 import org.hibernate.dialect.SelectItemReferenceStrategy;
@@ -348,6 +349,7 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 		functionFactory.variance();
 		functionFactory.bitLength_pattern( "length(?1)*8" );
 		functionFactory.varPop_sumCount();
+		functionFactory.hypotheticalOrderedSetAggregates();
 
 		final SqmFunctionRegistry functionRegistry = functionContributions.getFunctionRegistry();
 		final TypeConfiguration typeConfiguration = functionContributions.getTypeConfiguration();
@@ -1050,6 +1052,11 @@ public String getDual() {
 		return "(select 0 from systables where tabid=1)";
 	}
 
+	@Override
+	public boolean supportsCrossJoin() {
+		return false;
+	}
+
 	@Override
 	public boolean supportsRowValueConstructorSyntax() {
 		return false;
@@ -1078,4 +1085,9 @@ public IdentifierHelper buildIdentifierHelper(IdentifierHelperBuilder builder, @
 		}
 		return super.buildIdentifierHelper( builder, metadata );
 	}
+
+	@Override
+	public DmlTargetColumnQualifierSupport getDmlTargetColumnQualifierSupport() {
+		return DmlTargetColumnQualifierSupport.TABLE_ALIAS;
+	}
 }

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/InformixSqlAstTranslator.java

@@ -23,13 +23,15 @@
 import org.hibernate.sql.ast.tree.expression.SelfRenderingExpression;
 import org.hibernate.sql.ast.tree.expression.SqlTuple;
 import org.hibernate.sql.ast.tree.expression.Summarization;
+import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.from.ValuesTableReference;
 import org.hibernate.sql.ast.tree.insert.ConflictClause;
 import org.hibernate.sql.ast.tree.insert.InsertSelectStatement;
 import org.hibernate.sql.ast.tree.select.QueryGroup;
 import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
 import org.hibernate.sql.ast.tree.select.SelectClause;
+import org.hibernate.sql.ast.tree.update.UpdateStatement;
 import org.hibernate.sql.exec.spi.JdbcOperation;
 import org.hibernate.sql.model.internal.TableInsertStandard;
 
@@ -136,6 +138,25 @@ public void visitOffsetFetchClause(QueryPart queryPart) {
 		if ( !queryPart.isRoot() && queryPart.getOffsetClauseExpression() != null ) {
 			throw new IllegalArgumentException( "Can't emulate offset clause in subquery" );
 		}
+		// We use 'select first n' on Informix, so nothing to do here
+	}
+
+	@Override
+	protected void beforeQueryGroup(QueryGroup queryGroup, QueryPart currentQueryPart) {
+		if ( queryGroup.isRoot() && queryGroup.hasOffsetOrFetchClause() ) {
+			append( "select ");
+			renderFirstSkipClause( queryGroup.getOffsetClauseExpression(),
+					queryGroup.getFetchClauseExpression() );
+			append(  "* from " );
+			append( OPEN_PARENTHESIS );
+		}
+	}
+
+	@Override
+	protected void afterQueryGroup(QueryGroup queryGroup, QueryPart currentQueryPart) {
+		if ( queryGroup.isRoot() && queryGroup.hasOffsetOrFetchClause() ) {
+			append( CLOSE_PARENTHESIS );
+		}
 	}
 
 	@Override
@@ -323,4 +344,22 @@ public void visitBinaryArithmeticExpression(BinaryArithmeticExpression arithmeti
 		}
 		super.visitBinaryArithmeticExpression( arithmeticExpression );
 	}
+
+	@Override
+	protected void renderDmlTargetTableExpression(NamedTableReference tableReference) {
+		super.renderDmlTargetTableExpression( tableReference );
+		if ( getClauseStack().getCurrent() != Clause.INSERT ) {
+			renderTableReferenceIdentificationVariable( tableReference );
+		}
+	}
+
+	@Override
+	protected void visitUpdateStatementOnly(UpdateStatement statement) {
+		if ( hasNonTrivialFromClause( statement.getFromClause() ) ) {
+			visitUpdateStatementEmulateMerge( statement );
+		}
+		else {
+			super.visitUpdateStatementOnly( statement );
+		}
+	}
 }

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java

@@ -739,4 +739,8 @@ public boolean supportsJoinsInDelete() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsCrossJoin() {
+		return false;
+	}
 }

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacySqlAstTranslator.java

@@ -15,7 +15,6 @@
 import org.hibernate.query.IllegalQueryOperationException;
 import org.hibernate.query.sqm.ComparisonOperator;
 import org.hibernate.sql.ast.Clause;
-import org.hibernate.sql.ast.SqlAstJoinType;
 import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
 import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator;
 import org.hibernate.sql.ast.spi.SqlSelection;
@@ -28,19 +27,15 @@
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.Literal;
-import org.hibernate.sql.ast.tree.expression.QueryLiteral;
 import org.hibernate.sql.ast.tree.expression.SqlTuple;
 import org.hibernate.sql.ast.tree.expression.Summarization;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.ast.tree.from.TableGroupJoin;
 import org.hibernate.sql.ast.tree.from.UnionTableReference;
 import org.hibernate.sql.ast.tree.from.ValuesTableReference;
 import org.hibernate.sql.ast.tree.insert.ConflictClause;
 import org.hibernate.sql.ast.tree.insert.InsertSelectStatement;
 import org.hibernate.sql.ast.tree.insert.Values;
-import org.hibernate.sql.ast.tree.predicate.BooleanExpressionPredicate;
-import org.hibernate.sql.ast.tree.predicate.Predicate;
 import org.hibernate.sql.ast.tree.select.QueryGroup;
 import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
@@ -236,30 +231,6 @@ private void renderLockHint(LockMode lockMode) {
 		}
 	}
 
-	@Override
-	protected void renderTableGroupJoin(TableGroupJoin tableGroupJoin, List<TableGroupJoin> tableGroupJoinCollector) {
-		appendSql( WHITESPACE );
-		if ( tableGroupJoin.getJoinType() != SqlAstJoinType.CROSS ) {
-			// No support for cross joins, so we emulate it with an inner join and always true on condition
-			appendSql( tableGroupJoin.getJoinType().getText() );
-		}
-		appendSql( "join " );
-
-		final Predicate predicate;
-		if ( tableGroupJoin.getPredicate() == null ) {
-			predicate = new BooleanExpressionPredicate( new QueryLiteral<>( true, getBooleanType() ) );
-		}
-		else {
-			predicate = tableGroupJoin.getPredicate();
-		}
-		if ( predicate != null && !predicate.isEmpty() ) {
-			renderTableGroup( tableGroupJoin.getJoinedGroup(), predicate, tableGroupJoinCollector );
-		}
-		else {
-			renderTableGroup( tableGroupJoin.getJoinedGroup(), null, tableGroupJoinCollector );
-		}
-	}
-
 	@Override
 	protected LockStrategy determineLockingStrategy(
 			QuerySpec querySpec,

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenDialect.java

@@ -353,6 +353,11 @@ public boolean isCurrentTimestampSelectStringCallable() {
 		return false;
 	}
 
+	@Override
+	public boolean supportsCrossJoin() {
+		return false;
+	}
+
 	@Override
 	public SqmMultiTableMutationStrategy getFallbackSqmMutationStrategy(
 			EntityMappingType rootEntityDescriptor,

hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/TimesTenSqlAstTranslator.java

@@ -9,18 +9,13 @@
 import org.hibernate.engine.spi.SessionFactoryImplementor;
 import org.hibernate.query.IllegalQueryOperationException;
 import org.hibernate.query.sqm.ComparisonOperator;
-import org.hibernate.sql.ast.SqlAstJoinType;
 import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator;
 import org.hibernate.sql.ast.spi.SqlSelection;
 import org.hibernate.sql.ast.tree.Statement;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.Literal;
-import org.hibernate.sql.ast.tree.expression.QueryLiteral;
 import org.hibernate.sql.ast.tree.expression.SqlTuple;
 import org.hibernate.sql.ast.tree.expression.Summarization;
-import org.hibernate.sql.ast.tree.from.TableGroupJoin;
-import org.hibernate.sql.ast.tree.predicate.BooleanExpressionPredicate;
-import org.hibernate.sql.ast.tree.predicate.Predicate;
 import org.hibernate.sql.ast.tree.select.QueryGroup;
 import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
@@ -55,30 +50,6 @@ protected LockStrategy determineLockingStrategy(
 		return strategy;
 	}
 
-	@Override
-	protected void renderTableGroupJoin(TableGroupJoin tableGroupJoin, List<TableGroupJoin> tableGroupJoinCollector) {
-		appendSql( WHITESPACE );
-		if ( tableGroupJoin.getJoinType() != SqlAstJoinType.CROSS ) {
-			// No support for cross joins, so we emulate it with an inner join and always true on condition
-			appendSql( tableGroupJoin.getJoinType().getText() );
-		}
-		appendSql( "join " );
-
-		final Predicate predicate;
-		if ( tableGroupJoin.getPredicate() == null ) {
-			predicate = new BooleanExpressionPredicate( new QueryLiteral<>( true, getBooleanType() ) );
-		}
-		else {
-			predicate = tableGroupJoin.getPredicate();
-		}
-		if ( predicate != null && !predicate.isEmpty() ) {
-			renderTableGroup( tableGroupJoin.getJoinedGroup(), predicate, tableGroupJoinCollector );
-		}
-		else {
-			renderTableGroup( tableGroupJoin.getJoinedGroup(), null, tableGroupJoinCollector );
-		}
-	}
-
 	@Override
 	protected void visitSqlSelections(SelectClause selectClause) {
 		renderRowsToClause( (QuerySpec) getQueryPartStack().getCurrent() );

hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java

@@ -6134,6 +6134,13 @@ public boolean supportsSimpleQueryGrouping() {
 		return true;
 	}
 
+	/**
+	 * Is the {@code cross join} syntax supported?
+	 */
+	public boolean supportsCrossJoin() {
+		return true;
+	}
+
 	/**
 	 * Is this dialect known to support what ANSI-SQL terms "row value
 	 * constructor" syntax; sometimes called tuple syntax.

hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java

@@ -764,4 +764,8 @@ public boolean supportsJoinsInDelete() {
 		return true;
 	}
 
+	@Override
+	public boolean supportsCrossJoin() {
+		return false;
+	}
 }

hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/SybaseASESqlAstTranslator.java

@@ -17,7 +17,6 @@
 import org.hibernate.query.IllegalQueryOperationException;
 import org.hibernate.query.sqm.ComparisonOperator;
 import org.hibernate.sql.ast.Clause;
-import org.hibernate.sql.ast.SqlAstJoinType;
 import org.hibernate.sql.ast.SqlAstNodeRenderingMode;
 import org.hibernate.sql.ast.spi.AbstractSqlAstTranslator;
 import org.hibernate.sql.ast.spi.SqlSelection;
@@ -30,19 +29,15 @@
 import org.hibernate.sql.ast.tree.expression.ColumnReference;
 import org.hibernate.sql.ast.tree.expression.Expression;
 import org.hibernate.sql.ast.tree.expression.Literal;
-import org.hibernate.sql.ast.tree.expression.QueryLiteral;
 import org.hibernate.sql.ast.tree.expression.SqlTuple;
 import org.hibernate.sql.ast.tree.expression.Summarization;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.from.TableGroup;
-import org.hibernate.sql.ast.tree.from.TableGroupJoin;
 import org.hibernate.sql.ast.tree.from.UnionTableReference;
 import org.hibernate.sql.ast.tree.from.ValuesTableReference;
 import org.hibernate.sql.ast.tree.insert.ConflictClause;
 import org.hibernate.sql.ast.tree.insert.InsertSelectStatement;
 import org.hibernate.sql.ast.tree.insert.Values;
-import org.hibernate.sql.ast.tree.predicate.BooleanExpressionPredicate;
-import org.hibernate.sql.ast.tree.predicate.Predicate;
 import org.hibernate.sql.ast.tree.select.QueryGroup;
 import org.hibernate.sql.ast.tree.select.QueryPart;
 import org.hibernate.sql.ast.tree.select.QuerySpec;
@@ -224,30 +219,6 @@ private void renderLockHint(LockMode lockMode) {
 		}
 	}
 
-	@Override
-	protected void renderTableGroupJoin(TableGroupJoin tableGroupJoin, List<TableGroupJoin> tableGroupJoinCollector) {
-		appendSql( WHITESPACE );
-		if ( tableGroupJoin.getJoinType() != SqlAstJoinType.CROSS ) {
-			// No support for cross joins, so we emulate it with an inner join and always true on condition
-			appendSql( tableGroupJoin.getJoinType().getText() );
-		}
-		appendSql( "join " );
-
-		final Predicate predicate;
-		if ( tableGroupJoin.getPredicate() == null ) {
-			predicate = new BooleanExpressionPredicate( new QueryLiteral<>( true, getBooleanType() ) );
-		}
-		else {
-			predicate = tableGroupJoin.getPredicate();
-		}
-		if ( predicate != null && !predicate.isEmpty() ) {
-			renderTableGroup( tableGroupJoin.getJoinedGroup(), predicate, tableGroupJoinCollector );
-		}
-		else {
-			renderTableGroup( tableGroupJoin.getJoinedGroup(), null, tableGroupJoinCollector );
-		}
-	}
-
 	@Override
 	protected LockStrategy determineLockingStrategy(
 			QuerySpec querySpec,