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

dreab8 · dreab8 · commit d1862220afad · 2025-07-29T16:07:44.000+02:00
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MariaDBLegacySqlAstTranslator.java
@@ -394,4 +394,13 @@ protected void renderStringContainsExactlyPredicate(Expression haystack, Express
 		needle.accept( this );
 		appendSql( ",'~','~~'),'?','~?'),'%','~%'),'%') escape '~'" );
 	}
+
+	@Override
+	protected void appendAssignmentColumn(ColumnReference column) {
+		column.appendColumnForWrite(
+				this,
+				getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement)
+						? determineColumnReferenceQualifier( column )
+						: null );
+	}
 }
diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/MySQLLegacySqlAstTranslator.java
@@ -385,4 +385,13 @@ protected void renderStringContainsExactlyPredicate(Expression haystack, Express
 		needle.accept( this );
 		appendSql( ",'~','~~'),'?','~?'),'%','~%'),'%') escape '~'" );
 	}
+
+	@Override
+	protected void appendAssignmentColumn(ColumnReference column) {
+		column.appendColumnForWrite(
+				this,
+				getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement)
+						? determineColumnReferenceQualifier( column )
+						: null );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MariaDBSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MariaDBSqlAstTranslator.java
@@ -422,4 +422,12 @@ protected void renderUpdatevalue(ColumnValueBinding columnValueBinding) {
 		appendSql( ")" );
 	}
 
+	@Override
+	protected void appendAssignmentColumn(ColumnReference column) {
+		column.appendColumnForWrite(
+				this,
+				getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement)
+						? determineColumnReferenceQualifier( column )
+						: null );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MySQLSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MySQLSqlAstTranslator.java
@@ -459,4 +459,12 @@ private void renderAlias() {
 		appendSql( "tr" );
 	}
 
+	@Override
+	protected void appendAssignmentColumn(ColumnReference column) {
+		column.appendColumnForWrite(
+				this,
+				getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement)
+						? determineColumnReferenceQualifier( column )
+						: null );
+	}
 }
diff --git a/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/sql/ast/spi/AbstractSqlAstTranslator.java
@@ -1143,7 +1143,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 ) {
@@ -1158,7 +1158,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( ")=" );
@@ -1167,7 +1167,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++ ) {
@@ -1179,6 +1179,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 ) {

Original file line number	Diff line number	Diff line change
`@@ -394,4 +394,13 @@ protected void renderStringContainsExactlyPredicate(Expression haystack, Express`
`394`	`394`	`needle.accept( this );`
`395`	`395`	`appendSql( ",'~','~~'),'?','~?'),'%','~%'),'%') escape '~'" );`
`396`	`396`	`}`
	`397`	`+`
	`398`	`+ @Override`
	`399`	`+ protected void appendAssignmentColumn(ColumnReference column) {`
	`400`	`+ column.appendColumnForWrite(`
	`401`	`+ this,`
	`402`	`+ getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement)`
	`403`	`+ ? determineColumnReferenceQualifier( column )`
	`404`	`+ : null );`
	`405`	`+ }`
`397`	`406`	`}`
Original file line number	Diff line number	Diff line change
`@@ -385,4 +385,13 @@ protected void renderStringContainsExactlyPredicate(Expression haystack, Express`
`385`	`385`	`needle.accept( this );`
`386`	`386`	`appendSql( ",'~','~~'),'?','~?'),'%','~%'),'%') escape '~'" );`
`387`	`387`	`}`
	`388`	`+`
	`389`	`+ @Override`
	`390`	`+ protected void appendAssignmentColumn(ColumnReference column) {`
	`391`	`+ column.appendColumnForWrite(`
	`392`	`+ this,`
	`393`	`+ getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement)`
	`394`	`+ ? determineColumnReferenceQualifier( column )`
	`395`	`+ : null );`
	`396`	`+ }`
`388`	`397`	`}`
Original file line number	Diff line number	Diff line change
`@@ -422,4 +422,12 @@ protected void renderUpdatevalue(ColumnValueBinding columnValueBinding) {`
`422`	`422`	`appendSql( ")" );`
`423`	`423`	`}`
`424`	`424`
	`425`	`+ @Override`
	`426`	`+ protected void appendAssignmentColumn(ColumnReference column) {`
	`427`	`+ column.appendColumnForWrite(`
	`428`	`+ this,`
	`429`	`+ getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement)`
	`430`	`+ ? determineColumnReferenceQualifier( column )`
	`431`	`+ : null );`
	`432`	`+ }`
`425`	`433`	`}`
Original file line number	Diff line number	Diff line change
`@@ -459,4 +459,12 @@ private void renderAlias() {`
`459`	`459`	`appendSql( "tr" );`
`460`	`460`	`}`
`461`	`461`
	`462`	`+ @Override`
	`463`	`+ protected void appendAssignmentColumn(ColumnReference column) {`
	`464`	`+ column.appendColumnForWrite(`
	`465`	`+ this,`
	`466`	`+ getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement)`
	`467`	`+ ? determineColumnReferenceQualifier( column )`
	`468`	`+ : null );`
	`469`	`+ }`
`462`	`470`	`}`