From mpoeschl@apache.org Tue May 13 16:42:19 2003 Return-Path: Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm Delivered-To: mailing list torque-dev@db.apache.org Received: (qmail 12688 invoked by uid 500); 13 May 2003 16:42:19 -0000 Received: (qmail 12669 invoked from network); 13 May 2003 16:42:18 -0000 Received: from icarus.apache.org (208.185.179.13) by daedalus.apache.org with SMTP; 13 May 2003 16:42:18 -0000 Received: (qmail 23203 invoked by uid 1280); 13 May 2003 16:42:18 -0000 Date: 13 May 2003 16:42:18 -0000 Message-ID: <20030513164218.23202.qmail@icarus.apache.org> From: mpoeschl@apache.org To: db-torque-cvs@apache.org Subject: cvs commit: db-torque/src/java/org/apache/torque/util BasePeer.java X-Spam-Rating: daedalus.apache.org 1.6.2 0/1000/N mpoeschl 2003/05/13 09:42:17 Modified: xdocs changes.xml src/java/org/apache/torque/util BasePeer.java Log: TRQS153: BasePeer.doSelect(Criteria, Connection) calls executeQuery without offset and limit. Revision Changes Path 1.75 +31 -0 db-torque/xdocs/changes.xml Index: changes.xml =================================================================== RCS file: /home/cvs/db-torque/xdocs/changes.xml,v retrieving revision 1.74 retrieving revision 1.75 diff -u -r1.74 -r1.75 --- changes.xml 17 Apr 2003 14:04:21 -0000 1.74 +++ changes.xml 13 May 2003 16:42:17 -0000 1.75 @@ -9,6 +9,37 @@ +
+

+ Changes between Torque 3.1-alpha1 and 3.1-alpha2.
+

+ + +

+

    +
+

+ + + +

+

    +
+

+ + + +

+

    +
  • + TRQS153: BasePeer.doSelect(Criteria, Connection) calls executeQuery + without offset and limit. +
    • +
+

+ +
+

1.65 +4 -10 db-torque/src/java/org/apache/torque/util/BasePeer.java Index: BasePeer.java =================================================================== RCS file: /home/cvs/db-torque/src/java/org/apache/torque/util/BasePeer.java,v retrieving revision 1.64 retrieving revision 1.65 diff -u -r1.64 -r1.65 --- BasePeer.java 24 Mar 2003 21:53:41 -0000 1.64 +++ BasePeer.java 13 May 2003 16:42:17 -0000 1.65 @@ -1328,14 +1328,7 @@ con = Transaction.beginOptional( criteria.getDbName(), criteria.isUseTransaction()); - - results = executeQuery( - createQueryString(criteria), - criteria.getOffset(), - criteria.getLimit(), - criteria.isSingleRecord(), - con); - + results = doSelect(criteria, con); Transaction.commit(con); } catch (Exception e) @@ -1343,7 +1336,6 @@ Transaction.rollback(con); throw new TorqueException(e); } - return results; } @@ -1361,6 +1353,8 @@ { return executeQuery( createQueryString(criteria), + criteria.getOffset(), + criteria.getLimit(), criteria.isSingleRecord(), con); }