HHH-19579 Criteria update join - Column 'code' in SET is ambiguous

Author: dreab8

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

@@ -399,4 +399,14 @@ protected void renderStringContainsExactlyPredicate(Expression haystack, Express
 		needle.accept( this );
 		appendSql( ",'~','~~'),'?','~?'),'%','~%'),'%') escape '~'" );
 	}
+
+	@Override
+	protected void appendAssignmentColumn(ColumnReference column) {
+		if ( getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement) ) {
+			column.appendColumnForWrite( this );
+		}
+		else {
+			column.appendColumnForWrite( this, null );
+		}
+	}
 }

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

@@ -390,4 +390,14 @@ protected void renderStringContainsExactlyPredicate(Expression haystack, Express
 		needle.accept( this );
 		appendSql( ",'~','~~'),'?','~?'),'%','~%'),'%') escape '~'" );
 	}
+
+	@Override
+	protected void appendAssignmentColumn(ColumnReference column) {
+		if ( getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement) ) {
+			column.appendColumnForWrite( this );
+		}
+		else {
+			column.appendColumnForWrite( this, null );
+		}
+	}
 }

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

@@ -427,4 +427,13 @@ protected void renderUpdatevalue(ColumnValueBinding columnValueBinding) {
 		appendSql( ")" );
 	}
 
+	@Override
+	protected void appendAssignmentColumn(ColumnReference column) {
+		if ( getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement) ) {
+			column.appendColumnForWrite( this );
+		}
+		else {
+			column.appendColumnForWrite( this, null );
+		}
+	}
 }

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

@@ -464,4 +464,13 @@ private void renderAlias() {
 		appendSql( "tr" );
 	}
 
+	@Override
+	protected void appendAssignmentColumn(ColumnReference column) {
+		if ( getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement) ) {
+			column.appendColumnForWrite( this );
+		}
+		else {
+			column.appendColumnForWrite( this, null );
+		}
+	}
 }

hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java

@@ -1160,7 +1160,7 @@ protected void visitSetAssignment(Assignment assignment) {
 		final List<ColumnReference> columnReferences = assignable.getColumnReferences();
 		final Expression assignedValue = assignment.getAssignedValue();
 		if ( columnReferences.size() == 1 ) {
-			columnReferences.get( 0 ).appendColumnForWrite( this, null );
+			appendAssignmentColumn( columnReferences.get( 0 ) );
 			appendSql( '=' );
 			final SqlTuple sqlTuple = getSqlTuple( assignedValue );
 			if ( sqlTuple != null ) {
@@ -1175,7 +1175,7 @@ else if ( assignedValue instanceof SelectStatement ) {
 			char separator = OPEN_PARENTHESIS;
 			for ( ColumnReference columnReference : columnReferences ) {
 				appendSql( separator );
-				columnReference.appendColumnForWrite( this, null );
+				appendAssignmentColumn( columnReference );
 				separator = COMMA_SEPARATOR_CHAR;
 			}
 			appendSql( ")=" );
@@ -1184,7 +1184,7 @@ else if ( assignedValue instanceof SelectStatement ) {
 		else {
 			assert assignedValue instanceof SqlTupleContainer;
 			final List<? extends Expression> expressions = ( (SqlTupleContainer) assignedValue ).getSqlTuple().getExpressions();
-			columnReferences.get( 0 ).appendColumnForWrite( this, null );
+			appendAssignmentColumn( columnReferences.get( 0 ) );
 			appendSql( '=' );
 			expressions.get( 0 ).accept( this );
 			for ( int i = 1; i < columnReferences.size(); i++ ) {
@@ -1196,6 +1196,10 @@ else if ( assignedValue instanceof SelectStatement ) {
 		}
 	}
 
+	protected void appendAssignmentColumn(ColumnReference column) {
+		column.appendColumnForWrite( this, null );
+	}
+
 	protected void visitSetAssignmentEmulateJoin(Assignment assignment, UpdateStatement statement) {
 		final Assignable assignable = assignment.getAssignable();
 		if ( assignable instanceof SqmPathInterpretation<?> sqmPathInterpretation ) {