dobbs 02/05/06 22:57:19
Modified: src/java/org/apache/torque/util BasePeer.java Query.java
Log:
coding standards
Revision Changes Path
1.39 +6 -6
jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java
Index: BasePeer.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-torque/src/java/org/apache/torque/util/BasePeer.java,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -r1.38 -r1.39
--- BasePeer.java 7 May 2002 05:18:41 -0000 1.38
+++ BasePeer.java 7 May 2002 05:57:19 -0000 1.39
@@ -106,7 +106,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>John D. McNally</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Brett McLaughlin</a>
- * @version $Id: BasePeer.java,v 1.38 2002/05/07 05:18:41 dobbs Exp $
+ * @version $Id: BasePeer.java,v 1.39 2002/05/07 05:57:19 dobbs Exp $
*/
public abstract class BasePeer implements java.io.Serializable
{
@@ -1232,13 +1232,13 @@
}
Criteria.Criterion having = criteria.getHaving();
- if ( having != null )
+ if (having != null)
{
- //String groupByString = null;
- query.setHaving(having.toString());
+ //String groupByString = null;
+ query.setHaving(having.toString());
}
- if ( orderBy != null && orderBy.size() > 0)
+ if (orderBy != null && orderBy.size() > 0)
{
// Check for each String/Character column and apply
// toUpperCase().
@@ -1248,7 +1248,7 @@
if (orderByColumn.indexOf('.') == -1)
{
throwMalformedColumnNameException("order by",
- orderByColumn);
+ orderByColumn);
}
String table = orderByColumn.substring(0,orderByColumn.indexOf('.')
);
// See if there's a space (between the column list and sort
1.7 +15 -1
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.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Query.java 7 May 2002 05:40:51 -0000 1.6
+++ Query.java 7 May 2002 05:57:19 -0000 1.7
@@ -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.6 2002/05/07 05:40:51 dobbs Exp $
+ * @version $Id: Query.java,v 1.7 2002/05/07 05:57:19 dobbs Exp $
*/
public class Query
{
@@ -237,32 +237,46 @@
{
StringBuffer stmt = new StringBuffer();
if ( rowcount != null )
+ {
stmt.append(ROWCOUNT)
.append(rowcount)
.append(" ");
+ }
stmt.append(SELECT)
.append(selectModifiers.toString(" "))
.append(selectColumns.toString(", "))
.append(FROM)
.append(fromTables.toString(", "));
if ( !whereCriteria.empty() )
+ {
stmt.append(WHERE)
.append(whereCriteria.toString( AND ));
+ }
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);
+ }
if ( rowcount != null )
+ {
stmt.append(ROWCOUNT)
.append("0");
+ }
return stmt.toString();
}
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
