[hibernate-commits] Hibernate SVN: r14800 - annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/annotations.

[hibernate-commits at lists.jboss.org]

Author: cbredesen
Date: 2008-06-23 17:25:21 -0400 (Mon, 23 Jun 2008)
New Revision: 14800

Modified:
   annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/annotations/MapBinder.java
   annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/annotations/Version.java
Log:
JBPAPP-782

Modified: annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/annotations/MapBinder.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/annotations/MapBinder.java	2008-06-23 12:11:41 UTC (rev 14799)
+++ annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/annotations/MapBinder.java	2008-06-23 21:25:21 UTC (rev 14800)
@@ -7,7 +7,6 @@
 import java.util.Random;
 import javax.persistence.AttributeOverride;
 import javax.persistence.AttributeOverrides;
-import javax.persistence.MapKey;
 
 import org.hibernate.AnnotationException;
 import org.hibernate.AssertionFailure;
@@ -282,7 +281,9 @@
 			String alias = "$alias$";
 			StringBuilder fromAndWhereSb = new StringBuilder( " from " )
 					.append( associatedClass.getTable().getName() )
-					.append(" as ").append(alias).append(" where ");
+					//.append(" as ") //Oracle doesn't support it in subqueries
+					.append( " " )
+					.append( alias ).append( " where " );
 			Iterator collectionTableColumns = element.getColumnIterator();
 			while ( collectionTableColumns.hasNext() ) {
 				Column colColumn = (Column) collectionTableColumns.next();

Modified: annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/annotations/Version.java
===================================================================
--- annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/annotations/Version.java	2008-06-23 12:11:41 UTC (rev 14799)
+++ annotations/branches/v3_2_1_GA_CP/src/java/org/hibernate/cfg/annotations/Version.java	2008-06-23 21:25:21 UTC (rev 14800)
@@ -8,7 +8,7 @@
  * @author Emmanuel Bernard
  */
 public class Version {
-	public static final String VERSION = "3.2.1.GA";
+	public static final String VERSION = "3.2.1.GA.CP02";
 	private static Log log = LogFactory.getLog( Version.class );
 
 	static {