[jboss-cvs] JBossAS SVN: r69238 - branches/JBoss_4_0_4_GA_CP/server/src/main/org/jboss/ejb/plugins/cmp/jdbc.

[jboss-cvs-commits at lists.jboss.org]

Author: galder.zamarreno at jboss.com
Date: 2008-01-23 09:48:09 -0500 (Wed, 23 Jan 2008)
New Revision: 69238

Modified:
   branches/JBoss_4_0_4_GA_CP/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java
Log:
[ASPATCH-337] Fix included.

Modified: branches/JBoss_4_0_4_GA_CP/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java
===================================================================
--- branches/JBoss_4_0_4_GA_CP/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java	2008-01-23 13:15:22 UTC (rev 69237)
+++ branches/JBoss_4_0_4_GA_CP/server/src/main/org/jboss/ejb/plugins/cmp/jdbc/EJBQLToSQL92Compiler.java	2008-01-23 14:48:09 UTC (rev 69238)
@@ -48,6 +48,7 @@
  * Compiles EJB-QL and JBossQL into SQL using OUTER and INNER joins.
  *
  * @author <a href="mailto:alex at jboss.org">Alex Loubyansky</a>
+ * @author <a href="mailto:galder.zamarreno at jboss.com">Galder Zamarreno</a>
  * @version $Revision$
  */
 public final class EJBQLToSQL92Compiler
@@ -812,6 +813,15 @@
          else
          {
             SQLUtil.getSelfCompareWhereClause(member0.getPrimaryKeyFields(), memberAlias, colAliasLocal, sql);
+            
+            sql.append(SQLUtil.AND);
+
+            String col0Alias = aliasManager.getAlias(colPath.getPath(0));
+            String col0AliasLocal = aliasManager.getAlias(colPath.getPath(0) + "_local");
+            SQLUtil.getSelfCompareWhereClause(colEntity.getPrimaryKeyFields(),
+               col0Alias,
+               col0AliasLocal,
+               sql);            
          }
       }