Return-Path: Delivered-To: apmail-db-ojb-dev-archive@www.apache.org Received: (qmail 23035 invoked from network); 27 Apr 2005 19:13:36 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (209.237.227.199) by minotaur.apache.org with SMTP; 27 Apr 2005 19:13:36 -0000 Received: (qmail 31342 invoked by uid 500); 27 Apr 2005 19:14:32 -0000 Delivered-To: apmail-db-ojb-dev-archive@db.apache.org Received: (qmail 31322 invoked by uid 500); 27 Apr 2005 19:14:32 -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 15244 invoked by uid 500); 27 Apr 2005 14:26:27 -0000 X-ASF-Spam-Status: No, hits=0.2 required=10.0 tests=NO_REAL_NAME X-Spam-Check-By: apache.org Date: 27 Apr 2005 14:25:31 -0000 Message-ID: <20050427142531.7006.qmail@minotaur.apache.org> From: aclute@apache.org To: db-ojb-cvs@apache.org Subject: cvs commit: db-ojb/src/java/org/apache/ojb/broker/accesslayer MtoNCollectionPrefetcher.java X-Virus-Checked: Checked X-Spam-Rating: minotaur.apache.org 1.6.2 0/1000/N aclute 2005/04/27 07:25:31 Modified: src/java/org/apache/ojb/broker/accesslayer MtoNCollectionPrefetcher.java Log: [JIRA]OJB-32 -- Fix that allows for the MtoNCollectionPrefetcher to respect the orderby's for a collection descriptor. Revision Changes Path 1.24 +13 -1 db-ojb/src/java/org/apache/ojb/broker/accesslayer/MtoNCollectionPrefetcher.java Index: MtoNCollectionPrefetcher.java =================================================================== RCS file: /home/cvs/db-ojb/src/java/org/apache/ojb/broker/accesslayer/MtoNCollectionPrefetcher.java,v retrieving revision 1.23 retrieving revision 1.24 diff -u -r1.23 -r1.24 --- MtoNCollectionPrefetcher.java 23 Apr 2005 14:39:52 -0000 1.23 +++ MtoNCollectionPrefetcher.java 27 Apr 2005 14:25:31 -0000 1.24 @@ -33,6 +33,7 @@ import org.apache.ojb.broker.metadata.ClassDescriptor; import org.apache.ojb.broker.metadata.CollectionDescriptor; import org.apache.ojb.broker.metadata.FieldDescriptor; +import org.apache.ojb.broker.metadata.FieldHelper; import org.apache.ojb.broker.metadata.ObjectReferenceDescriptor; import org.apache.ojb.broker.metadata.fieldaccess.PersistentField; import org.apache.ojb.broker.query.Criteria; @@ -162,6 +163,17 @@ ReportQueryByCriteria q = getQueryFactory().newMtoNReportQuery(getItemClassDescriptor().getClassOfObject(), cols, crit, false, getCollectionDescriptor().getIndirectionTable()); q.setJdbcTypes(jdbcTypes); + + CollectionDescriptor cds = getCollectionDescriptor(); + //check if collection must be ordered + if (!cds.getOrderBy().isEmpty()) + { + Iterator iter = cds.getOrderBy().iterator(); + while (iter.hasNext()) + { + q.addOrderBy((FieldHelper) iter.next()); + } + } return q; } --------------------------------------------------------------------- To unsubscribe, e-mail: ojb-dev-unsubscribe@db.apache.org For additional commands, e-mail: ojb-dev-help@db.apache.org