Return-Path: Delivered-To: apmail-db-ojb-dev-archive@www.apache.org Received: (qmail 55908 invoked from network); 5 Sep 2003 22:03:10 -0000 Received: from daedalus.apache.org (HELO mail.apache.org) (208.185.179.12) by minotaur-2.apache.org with SMTP; 5 Sep 2003 22:03:10 -0000 Received: (qmail 45160 invoked by uid 500); 5 Sep 2003 22:02:50 -0000 Delivered-To: apmail-db-ojb-dev-archive@db.apache.org Received: (qmail 45123 invoked by uid 500); 5 Sep 2003 22:02:48 -0000 Mailing-List: contact ojb-dev-help@db.apache.org; run by ezmlm Precedence: bulk List-Unsubscribe: List-Subscribe: List-Help: List-Post: List-Id: "OJB Developers List" Reply-To: "OJB Developers List" Delivered-To: mailing list ojb-dev@db.apache.org Received: (qmail 45107 invoked by uid 500); 5 Sep 2003 22:02:48 -0000 Received: (qmail 45084 invoked from network); 5 Sep 2003 22:02:48 -0000 Received: from unknown (HELO minotaur.apache.org) (209.237.227.194) by daedalus.apache.org with SMTP; 5 Sep 2003 22:02:48 -0000 Received: (qmail 55854 invoked by uid 1510); 5 Sep 2003 22:02:55 -0000 Date: 5 Sep 2003 22:02:55 -0000 Message-ID: <20030905220255.55853.qmail@minotaur.apache.org> From: arminw@apache.org To: db-ojb-cvs@apache.org Subject: cvs commit: db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql SqlQueryStatement.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N arminw 2003/09/05 15:02:55 Modified: src/java/org/apache/ojb/broker/accesslayer/sql SqlQueryStatement.java Log: fix by Kurt Hoehn Revision Changes Path 1.54 +4 -3 db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java Index: SqlQueryStatement.java =================================================================== RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlQueryStatement.java,v retrieving revision 1.53 retrieving revision 1.54 diff -u -r1.53 -r1.54 --- SqlQueryStatement.java 5 Sep 2003 16:57:54 -0000 1.53 +++ SqlQueryStatement.java 5 Sep 2003 22:02:55 -0000 1.54 @@ -274,13 +274,14 @@ if (fld != null) { // added to suport the super reference descriptor - if(!fld.getClassDescriptor().getFullTableName().equals( aTableAlias.table)) + if(!fld.getClassDescriptor().getFullTableName().equals( aTableAlias.table) + && aTableAlias.hasJoins()) { Iterator itr = aTableAlias.joins.iterator(); while( itr.hasNext() ) { Join join = (Join) itr.next(); - if( join.right.table == fld.getClassDescriptor().getFullTableName() ) + if( join.right.table.equals(fld.getClassDescriptor().getFullTableName()) ) { result = join.right.alias + "." + fld.getColumnName(); break; --------------------------------------------------------------------- To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org For additional commands, e-mail: ojb-dev-help@db.apache.org