Return-Path: Delivered-To: apmail-db-ojb-dev-archive@www.apache.org Received: (qmail 72287 invoked from network); 27 Oct 2004 19:36:24 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur-2.apache.org with SMTP; 27 Oct 2004 19:36:24 -0000 Received: (qmail 15984 invoked by uid 500); 27 Oct 2004 19:36:16 -0000 Delivered-To: apmail-db-ojb-dev-archive@db.apache.org Received: (qmail 15901 invoked by uid 500); 27 Oct 2004 19:36:14 -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 15880 invoked by uid 500); 27 Oct 2004 19:36:13 -0000 Received: (qmail 15877 invoked by uid 99); 27 Oct 2004 19:36:13 -0000 X-ASF-Spam-Status: No, hits=-10.0 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from [209.237.227.194] (HELO minotaur.apache.org) (209.237.227.194) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 27 Oct 2004 12:36:12 -0700 Received: (qmail 72202 invoked by uid 1513); 27 Oct 2004 19:36:09 -0000 Date: 27 Oct 2004 19:36:09 -0000 Message-ID: <20041027193609.72201.qmail@minotaur.apache.org> From: brj@apache.org To: db-ojb-cvs@apache.org Subject: cvs commit: db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql SqlQueryStatement.java SqlSelectStatement.java TableAliasHandler.java X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N brj 2004/10/27 12:36:09 Modified: src/java/org/apache/ojb/broker/accesslayer/sql SqlQueryStatement.java SqlSelectStatement.java TableAliasHandler.java Log: minor refactorings / cleanups Revision Changes Path 1.89 +3 -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.88 retrieving revision 1.89 diff -u -r1.88 -r1.89 --- SqlQueryStatement.java 13 Oct 2004 20:06:17 -0000 1.88 +++ SqlQueryStatement.java 27 Oct 2004 19:36:09 -0000 1.89 @@ -1317,9 +1317,9 @@ * Gets the search table of this query. * @return Returns a TableAlias */ - protected TableAlias getSearchTable() + protected TableAlias getSearchAlias() { - return m_tableAliasHandler.getSearchTable(); + return m_tableAliasHandler.getSearchAlias(); } /** 1.31 +2 -2 db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSelectStatement.java Index: SqlSelectStatement.java =================================================================== RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/SqlSelectStatement.java,v retrieving revision 1.30 retrieving revision 1.31 diff -u -r1.30 -r1.31 --- SqlSelectStatement.java 20 Oct 2004 19:17:43 -0000 1.30 +++ SqlSelectStatement.java 27 Oct 2004 19:36:09 -0000 1.31 @@ -93,7 +93,7 @@ { buf.append(","); } - appendColumn(getSearchTable().alias, field.getColumnName(), buf); + appendColumn(getSearchAlias().alias, field.getColumnName(), buf); columnList.add(field.getAttributeName()); i++; } 1.5 +2 -3 db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/TableAliasHandler.java Index: TableAliasHandler.java =================================================================== RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/sql/TableAliasHandler.java,v retrieving revision 1.4 retrieving revision 1.5 diff -u -r1.4 -r1.5 --- TableAliasHandler.java 20 Oct 2004 19:17:43 -0000 1.4 +++ TableAliasHandler.java 27 Oct 2004 19:36:09 -0000 1.5 @@ -37,7 +37,6 @@ import org.apache.ojb.broker.query.SqlCriteria; import org.apache.ojb.broker.query.UserAlias; import org.apache.ojb.broker.util.SqlHelper; -import org.apache.ojb.broker.util.SqlHelper.PathInfo; import org.apache.ojb.broker.util.logging.Logger; import org.apache.ojb.broker.util.logging.LoggerFactory; @@ -156,7 +155,7 @@ * Gets the search table of this query. * @return Returns a TableAlias */ - TableAlias getSearchTable() + TableAlias getSearchAlias() { return m_searchAlias; } --------------------------------------------------------------------- To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org For additional commands, e-mail: ojb-dev-help@db.apache.org