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

dreab8 · dreab8 · commit b917a9f8b921 · 2025-07-29T16:08:02.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
@@ -399,4 +399,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
@@ -390,4 +390,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
@@ -411,4 +411,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/MySQLSqlAstTranslator.java b/hibernate-core/src/main/java/org/hibernate/dialect/sql/ast/MySQLSqlAstTranslator.java
@@ -437,4 +437,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/sql/ast/spi/AbstractSqlAstTranslator.java b/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 ) {

Original file line number	Diff line number	Diff line change
`@@ -399,4 +399,13 @@ protected void renderStringContainsExactlyPredicate(Expression haystack, Express`
`399`	`399`	`needle.accept( this );`
`400`	`400`	`appendSql( ",'~','~~'),'?','~?'),'%','~%'),'%') escape '~'" );`
`401`	`401`	`}`
	`402`	`+`
	`403`	`+ @Override`
	`404`	`+ protected void appendAssignmentColumn(ColumnReference column) {`
	`405`	`+ column.appendColumnForWrite(`
	`406`	`+ this,`
	`407`	`+ getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement)`
	`408`	`+ ? determineColumnReferenceQualifier( column )`
	`409`	`+ : null );`
	`410`	`+ }`
`402`	`411`	`}`
Original file line number	Diff line number	Diff line change
`@@ -390,4 +390,13 @@ protected void renderStringContainsExactlyPredicate(Expression haystack, Express`
`390`	`390`	`needle.accept( this );`
`391`	`391`	`appendSql( ",'~','~~'),'?','~?'),'%','~%'),'%') escape '~'" );`
`392`	`392`	`}`
	`393`	`+`
	`394`	`+ @Override`
	`395`	`+ protected void appendAssignmentColumn(ColumnReference column) {`
	`396`	`+ column.appendColumnForWrite(`
	`397`	`+ this,`
	`398`	`+ getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement)`
	`399`	`+ ? determineColumnReferenceQualifier( column )`
	`400`	`+ : null );`
	`401`	`+ }`
`393`	`402`	`}`
Original file line number	Diff line number	Diff line change
`@@ -411,4 +411,13 @@ protected void renderStringContainsExactlyPredicate(Expression haystack, Express`
`411`	`411`	`needle.accept( this );`
`412`	`412`	`appendSql( ",'~','~~'),'?','~?'),'%','~%'),'%') escape '~'" );`
`413`	`413`	`}`
	`414`	`+`
	`415`	`+ @Override`
	`416`	`+ protected void appendAssignmentColumn(ColumnReference column) {`
	`417`	`+ column.appendColumnForWrite(`
	`418`	`+ this,`
	`419`	`+ getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement)`
	`420`	`+ ? determineColumnReferenceQualifier( column )`
	`421`	`+ : null );`
	`422`	`+ }`
`414`	`423`	`}`
Original file line number	Diff line number	Diff line change
`@@ -437,4 +437,13 @@ protected void renderStringContainsExactlyPredicate(Expression haystack, Express`
`437`	`437`	`needle.accept( this );`
`438`	`438`	`appendSql( ",'~','~~'),'?','~?'),'%','~%'),'%') escape '~'" );`
`439`	`439`	`}`
	`440`	`+`
	`441`	`+ @Override`
	`442`	`+ protected void appendAssignmentColumn(ColumnReference column) {`
	`443`	`+ column.appendColumnForWrite(`
	`444`	`+ this,`
	`445`	`+ getAffectedTableNames().size() > 1 && !(getStatement() instanceof InsertSelectStatement)`
	`446`	`+ ? determineColumnReferenceQualifier( column )`
	`447`	`+ : null );`
	`448`	`+ }`
`440`	`449`	`}`