[#JBPAPP-313] JBPAPP-258 - ANN-551 Guaranty the same parameter ordering when overriding SQL across VMs and compilations

[ Permlink | « Hide ]

Here is the patch http://fisheye.jboss.org/rdiff/Hibernate?csid=11182&u&N

[ Permlink | « Hide ]

Thanks Emmanuel. Switching ownership from Fernando Meyer to Fernando Nasser.

[ Permlink | « Hide ]

From the 650+ diff that that FishEye link shows me for src/org/hibernate/cfg/AnnotationBinder.java (which patch refused to apply), I was able to shorten it down to this 25 line diff (attached).

[ Permlink | « Hide ]

Fernando Nasser [24/Aug/07 11:42 AM]

Emmanuel, please confirm that the attached diff is the _complete_ fix for ANN-551. Thanks.

[ Permlink | « Hide ]

Emmanuel Bernard [24/Aug/07 02:48 PM]

Sorry for the mix of style refactoring and patch. I'll make sure we don't do that in the future.

Yes the diff is correct (actually it's the opposite diff, but the content is good).

Also apply the changes on the tests

Index: branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/query/Chaos.java
===================================================================
diff -u -N -r11171 -r11182
--- branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/query/Chaos.java (.../Chaos.java) (revision 11171)
+++ branches/Branch_3_2/HibernateExt/annotations/src/test/org/hibernate/test/annotations/query/Chaos.java (.../Chaos.java) (revision 11182)
@@ -22,8 +22,8 @@
*/
@Entity
@Table(name="CHAOS")
-@SQLInsert( sql="INSERT INTO CHAOS(size, name, nickname, id) VALUES(?,upper(?),?,?)")
-@SQLUpdate( sql="UPDATE CHAOS SET size = ?, name = upper(?), nickname = ? WHERE id = ?")
+@SQLInsert( sql="INSERT INTO CHAOS(name, nickname, size, id) VALUES(upper(?),?,?,?)")
+@SQLUpdate( sql="UPDATE CHAOS SET name = upper(?), nickname = ?, size = ? WHERE id = ?")
@SQLDelete( sql="DELETE CHAOS WHERE id = ?")
@SQLDeleteAll( sql="DELETE CHAOS")
@Loader(namedQuery = "chaos")

[ Permlink | « Hide ]

Fernando Nasser [24/Aug/07 03:12 PM]

NP. And yes, the reverse of that. I did apply the test patch, but with that I had no problem so I did not include it. Good that you've posted it for reference. Actually, I will replace the file with the complete patch for future reference.

Thanks for your help!

[ Permlink | « Hide ]

Fernando Nasser [24/Aug/07 03:14 PM]

Correct/complete version of patch

[ Permlink | « Hide ]

Fernando Nasser [24/Aug/07 03:54 PM]

Flipped JBPAPP_4_2_0_GA_CP branch to use 3.2.1.patch01