HHH-8434 CriteriaUpdate with multiple assignments incorrect

Author: brmeyer

hibernate-entitymanager/src/main/java/org/hibernate/jpa/criteria/CriteriaUpdateImpl.java

@@ -142,12 +142,12 @@ private void renderAssignments(StringBuilder jpaql, RenderingContext renderingCo
 		jpaql.append( " set " );
 		boolean first = true;
 		for ( Assignment assignment : assignments ) {
-			jpaql.append( assignment.attributePath.render( renderingContext ) )
-					.append( " = " )
-					.append( assignment.value.render( renderingContext ) );
 			if ( ! first ) {
 				jpaql.append( ", " );
 			}
+			jpaql.append( assignment.attributePath.render( renderingContext ) )
+					.append( " = " )
+					.append( assignment.value.render( renderingContext ) );
 			first = false;
 		}
 	}

hibernate-entitymanager/src/test/java/org/hibernate/jpa/test/criteria/ManipulationCriteriaTest.java

@@ -39,6 +39,7 @@
 import org.hibernate.jpa.test.metamodel.Customer;
 import org.hibernate.jpa.test.metamodel.Customer_;
 import org.hibernate.testing.SkipForDialect;
+import org.hibernate.testing.TestForIssue;
 import org.junit.Test;
 
 /**
@@ -116,6 +117,24 @@ public void testNoAssignments() {
 		em.getTransaction().rollback();
 		em.close();
 	}
+	
+	@Test
+	@TestForIssue(jiraKey = "HHH-8434")
+	public void basicMultipleAssignments() {
+		EntityManager em = getOrCreateEntityManager();
+		em.getTransaction().begin();
+
+		CriteriaBuilder builder = em.getCriteriaBuilder();
+
+		CriteriaUpdate<Customer> updateCriteria = builder.createCriteriaUpdate( Customer.class );
+		updateCriteria.from( Customer.class );
+		updateCriteria.set( Customer_.name, "Bob" );
+		updateCriteria.set( Customer_.age, 99 );
+		em.createQuery( updateCriteria ).executeUpdate();
+
+		em.getTransaction().commit();
+		em.close();
+	}
 
 	@Test
 	public void testJoinsAndFetchesDisallowed() {