dobbs 02/05/06 22:40:51
Modified: src/java/org/apache/torque/util Query.java
Log:
correcting the order of these clauses. Thanks to Sam for catching it.
Revision Changes Path
1.6 +4 -4
jakarta-turbine-torque/src/java/org/apache/torque/util/Query.java
Index: Query.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/util/Query.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Query.java 7 May 2002 05:18:41 -0000 1.5
+++ Query.java 7 May 2002 05:40:51 -0000 1.6
@@ -65,7 +65,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sam Joseph</a>
- * @version $Id: Query.java,v 1.5 2002/05/07 05:18:41 dobbs Exp $
+ * @version $Id: Query.java,v 1.6 2002/05/07 05:40:51 dobbs Exp $
*/
public class Query
{
@@ -248,15 +248,15 @@
if ( !whereCriteria.empty() )
stmt.append(WHERE)
.append(whereCriteria.toString( AND ));
- if ( !orderByColumns.empty() )
- stmt.append(ORDER_BY)
- .append(orderByColumns.toString(", "));
if ( !groupByColumns.empty() )
stmt.append(GROUP_BY)
.append(groupByColumns.toString(", "));
if ( having != null )
stmt.append(HAVING)
.append(having);
+ if ( !orderByColumns.empty() )
+ stmt.append(ORDER_BY)
+ .append(orderByColumns.toString(", "));
if ( limit != null )
stmt.append(LIMIT)
.append(limit);
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
