Handle lack of alias support for delete statements in MariaDB before version 11.6

Author: beikov

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

@@ -25,6 +25,7 @@
 import org.hibernate.sql.ast.tree.from.DerivedTableReference;
 import org.hibernate.sql.ast.tree.from.NamedTableReference;
 import org.hibernate.sql.ast.tree.from.QueryPartTableReference;
+import org.hibernate.sql.ast.tree.from.TableReference;
 import org.hibernate.sql.ast.tree.insert.ConflictClause;
 import org.hibernate.sql.ast.tree.insert.InsertSelectStatement;
 import org.hibernate.sql.ast.tree.predicate.BooleanExpressionPredicate;
@@ -117,7 +118,9 @@ protected void renderDeleteClause(DeleteStatement statement) {
 		final Stack<Clause> clauseStack = getClauseStack();
 		try {
 			clauseStack.push( Clause.DELETE );
-			renderTableReferenceIdentificationVariable( statement.getTargetTable() );
+			if ( supportsDeleteTableVariable() ) {
+				renderTableReferenceIdentificationVariable( statement.getTargetTable() );
+			}
 			if ( statement.getFromClause().getRoots().isEmpty() ) {
 				appendSql( " from " );
 				renderDmlTargetTableExpression( statement.getTargetTable() );
@@ -145,11 +148,28 @@ protected void renderUpdateClause(UpdateStatement updateStatement) {
 	@Override
 	protected void renderDmlTargetTableExpression(NamedTableReference tableReference) {
 		super.renderDmlTargetTableExpression( tableReference );
-		if ( getClauseStack().getCurrent() != Clause.INSERT ) {
+		final Clause currentClause = getClauseStack().getCurrent();
+		if ( getClauseStack().getCurrent() != Clause.INSERT
+			&& (currentClause != Clause.DELETE || supportsDeleteTableVariable()) ) {
 			renderTableReferenceIdentificationVariable( tableReference );
 		}
 	}
 
+	@Override
+	protected void renderTableReferenceIdentificationVariable(TableReference tableReference) {
+		final Stack<Clause> clauseStack = getCurrentClauseStack();
+		if ( clauseStack.getCurrent() == Clause.FROM && clauseStack.depth() > 1
+			&& clauseStack.peek( 1 ) == Clause.DELETE && !supportsDeleteTableVariable() ) {
+			return;
+		}
+		super.renderTableReferenceIdentificationVariable( tableReference );
+	}
+
+	private boolean supportsDeleteTableVariable() {
+		// Until 11.6, a DELETE statement doesn't support aliasing tables
+		return getDialect().getVersion().isSameOrAfter( 11, 6 );
+	}
+
 	@Override
 	protected JdbcOperationQueryInsert translateInsert(InsertSelectStatement sqlAst) {
 		visitInsertStatement( sqlAst );
@@ -178,7 +198,10 @@ protected String determineColumnReferenceQualifier(ColumnReference columnReferen
 				|| !( getCurrentDmlStatement() instanceof InsertSelectStatement insertSelectStatement )
 				|| ( dmlAlias = insertSelectStatement.getTargetTable().getIdentificationVariable() ) == null
 				|| !dmlAlias.equals( columnReference.getQualifier() ) ) {
-			return columnReference.getQualifier();
+			return !supportsDeleteTableVariable() && getCurrentDmlStatement() instanceof DeleteStatement statement
+				&& statement.getTargetTable().getIdentificationVariable().equals( columnReference.getQualifier() )
+					? getCurrentDmlStatement().getTargetTable().getTableExpression()
+					: columnReference.getQualifier();
 		}
 		// Qualify the column reference with the table expression also when in subqueries
 		else if ( qualifierSupport != DmlTargetColumnQualifierSupport.NONE || !getQueryPartStack().isEmpty() ) {