mpoeschl 2003/03/21 08:28:15
Modified: src/java/org/apache/torque/util Query.java
Added: src/test/org/apache/torque/util QueryTest.java
Log:
o add some setters to Query
o add QueryTest
Revision Changes Path
1.10 +42 -4 db-torque/src/java/org/apache/torque/util/Query.java
Index: Query.java
===================================================================
RCS file: /home/cvs/db-torque/src/java/org/apache/torque/util/Query.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- Query.java 12 Dec 2002 14:53:28 -0000 1.9
+++ Query.java 21 Mar 2003 16:28:15 -0000 1.10
@@ -102,6 +102,16 @@
{
return selectModifiers;
}
+
+ /**
+ * Set the modifiers. E.g. DISTINCT and ALL.
+ *
+ * @param modifiers the modifiers
+ */
+ public void setSelectModifiers(StringStack modifiers)
+ {
+ selectModifiers = modifiers;
+ }
/**
* Retrieve the columns buffer in order to specify which columns
@@ -115,19 +125,37 @@
return selectColumns;
}
+ /**
+ * Set the columns.
+ *
+ * @param columns columns list
+ */
+ public void setSelectClause(StringStack columns)
+ {
+ selectColumns = columns;
+ }
+
/**
* Retrieve the from buffer in order to specify which tables are
* involved in this query.
*
- *
- * @return A StringStack used to add tables involved in the
- * query.
+ * @return A StringStack used to add tables involved in the query.
*/
public StringStack getFromClause()
{
return fromTables;
}
+ /**
+ * Set the from clause.
+ *
+ * @param tables the tables
+ */
+ public void setFromClause(StringStack tables)
+ {
+ fromTables = tables;
+ }
+
/**
* Retrieve the where buffer in order to specify the selection
* criteria E.g. column_a=3. Expressions added to the buffer will
@@ -139,6 +167,16 @@
{
return whereCriteria;
}
+
+ /**
+ * Set the where clause.
+ *
+ * @param where where clause
+ */
+ public void setWhereClause(StringStack where)
+ {
+ whereCriteria = where;
+ }
/**
* Retrieve the order by columns buffer in order to specify which
1.1 db-torque/src/test/org/apache/torque/util/QueryTest.java
Index: QueryTest.java
===================================================================
package org.apache.torque.util;
/* ====================================================================
* The Apache Software License, Version 1.1
*
* Copyright (c) 2001-2003 The Apache Software Foundation. All rights
* reserved.
*
* Redistribution and use in source and binary forms, with or without
* modification, are permitted provided that the following conditions
* are met:
*
* 1. Redistributions of source code must retain the above copyright
* notice, this list of conditions and the following disclaimer.
*
* 2. Redistributions in binary form must reproduce the above copyright
* notice, this list of conditions and the following disclaimer in
* the documentation and/or other materials provided with the
* distribution.
*
* 3. The end-user documentation included with the redistribution,
* if any, must include the following acknowledgment:
* "This product includes software developed by the
* Apache Software Foundation (http://www.apache.org/)."
* Alternately, this acknowledgment may appear in the software itself,
* if and wherever such third-party acknowledgments normally appear.
*
* 4. The names "Apache" and "Apache Software Foundation" and
* "Apache Turbine" must not be used to endorse or promote products
* derived from this software without prior written permission. For
* written permission, please contact [EMAIL PROTECTED]
*
* 5. Products derived from this software may not be called "Apache",
* "Apache Turbine", nor may "Apache" appear in their name, without
* prior written permission of the Apache Software Foundation.
*
* THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
* WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
* OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
* DISCLAIMED. IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
* ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
* SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
* LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
* USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
* ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
* OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
* SUCH DAMAGE.
* ====================================================================
*
* This software consists of voluntary contributions made by many
* individuals on behalf of the Apache Software Foundation. For more
* information on the Apache Software Foundation, please see
* <http://www.apache.org/>.
*/
import junit.framework.TestCase;
import java.util.*;
import org.apache.commons.collections.StringStack;
/**
* Tests for Query
*
* @author <a href="mailto:[EMAIL PROTECTED]">Martin Poeschl</a>
* @version $Id: QueryTest.java,v 1.1 2003/03/21 16:28:15 mpoeschl Exp $
*/
public class QueryTest extends TestCase
{
/**
* Constructor for QueryTest.
* @param arg0
*/
public QueryTest(String arg0)
{
super(arg0);
}
/**
* Test for String toString()
*/
public void testColumns()
{
String expected
= "SELECT tableA.column1, tableA.column2, tableB.column1 FROM
";
Query query = new Query();
StringStack columns = new StringStack();
columns.add("tableA.column1");
columns.add("tableA.column2");
columns.add("tableB.column1");
query.setSelectClause(columns);
System.out.println(expected);
System.out.println(query.toString());
assertEquals(expected, query.toString());
}
/**
* Test for String toString()
*/
public void testToString()
{
String expected = "SELECT tableA.column1, tableA.column2, "
+ "tableB.column1 FROM tableA, tableB WHERE tableA.A =
tableB.A"
+ " AND tableA.B = 1234";
Query query = new Query();
StringStack columns = new StringStack();
columns.add("tableA.column1");
columns.add("tableA.column2");
columns.add("tableB.column1");
query.setSelectClause(columns);
StringStack tables = new StringStack();
tables.add("tableA");
tables.add("tableB");
query.setFromClause(tables);
StringStack where = new StringStack();
where.add("tableA.A = tableB.A");
where.add("tableA.B = 1234");
query.setWhereClause(where);
System.out.println(expected);
System.out.println(query.toString());
assertEquals(expected, query.toString());
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
