From mpoeschl@apache.org  Fri Jun 20 08:30:10 2003
Return-Path: <mpoeschl@apache.org>
Mailing-List: contact torque-dev-help@db.apache.org; run by ezmlm
Delivered-To: mailing list torque-dev@db.apache.org
Received: (qmail 8061 invoked by uid 500); 20 Jun 2003 08:30:10 -0000
Received: (qmail 8030 invoked from network); 20 Jun 2003 08:30:09 -0000
Received: from icarus.apache.org (208.185.179.13)
  by daedalus.apache.org with SMTP; 20 Jun 2003 08:30:09 -0000
Received: (qmail 33437 invoked by uid 1280); 20 Jun 2003 08:30:07 -0000
Date: 20 Jun 2003 08:30:07 -0000
Message-ID: <20030620083007.33436.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/06/20 01:30:07

  Modified:    xdocs    changes.xml
               src/java/org/apache/torque/util BasePeer.java
  Log:
  TRQS121: native limit and offset breaks on postgresql 7.3
  
  Revision  Changes    Path
  1.82      +5 -2      db-torque/xdocs/changes.xml
  
  Index: changes.xml
  ===================================================================
  RCS file: /home/cvs/db-torque/xdocs/changes.xml,v
  retrieving revision 1.81
  retrieving revision 1.82
  diff -u -r1.81 -r1.82
  --- changes.xml	20 Jun 2003 07:42:43 -0000	1.81
  +++ changes.xml	20 Jun 2003 08:30:07 -0000	1.82
  @@ -36,8 +36,7 @@
   <p>
     <ul>
       <li>
  -      TRQS153: BasePeer.doSelect(Criteria, Connection) calls executeQuery 
  -      without offset and limit.
  +      TRQS121: native limit and offset breaks on postgresql 7.3
       </li>
       <li>
         TRQS139: wrong invocation of populateObject in peer class
  @@ -45,6 +44,10 @@
       <li>
         TRQS141: Table with no primary key results an empty ADD PRIMARY KEY ()
       </li>  
  +    <li>
  +      TRQS153: BasePeer.doSelect(Criteria, Connection) calls executeQuery 
  +      without offset and limit.
  +    </li>
       <li>
         TRQS165: columns in an external schema caused Manager imports to be 
         generated
  
  
  
  1.68      +3 -3      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.67
  retrieving revision 1.68
  diff -u -r1.67 -r1.68
  --- BasePeer.java	18 May 2003 11:14:47 -0000	1.67
  +++ BasePeer.java	20 Jun 2003 08:30:07 -0000	1.68
  @@ -1270,7 +1270,7 @@
                   case DB.LIMIT_STYLE_POSTGRES :
                       limitString = new StringBuffer()
                               .append(limit)
  -                            .append(", ")
  +                            .append(" offset ")
                               .append(offset)
                               .toString();
                       break;
  @@ -2472,7 +2472,7 @@
                   case DB.LIMIT_STYLE_POSTGRES :
                       limitString = new StringBuffer()
                               .append(limit)
  -                            .append(", ")
  +                            .append(" offset ")
                               .append(offset)
                               .toString();
                       break;