jstrachan 2002/09/17 12:56:25
Modified: sql/src/java/org/apache/commons/sql/dynabean DynaSql.java
sql/src/test/org/apache/commons/sql/dynabean
AbstractTestDynaSql.java
Log:
Taken the ResultSetIterator class out of the DynaSql API (as its package protected)
and just use Iterator for now instead.
Revision Changes Path
1.6 +8 -6
jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/dynabean/DynaSql.java
Index: DynaSql.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/sql/src/java/org/apache/commons/sql/dynabean/DynaSql.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- DynaSql.java 16 Sep 2002 14:51:08 -0000 1.5
+++ DynaSql.java 17 Sep 2002 19:56:24 -0000 1.6
@@ -160,8 +160,8 @@
/**
* Performs the given SQL query returning an iterator over the results.
*/
- public ResultSetIterator query(String sql) throws SQLException,
IllegalAccessException, InstantiationException {
- ResultSetIterator answer = null;
+ public Iterator query(String sql) throws SQLException, IllegalAccessException,
InstantiationException {
+ Iterator answer = null;
Connection connection = borrowConnection();
Statement statement = null;
ResultSet resultSet = null;
@@ -184,8 +184,8 @@
*
* @return an Iterator which appears like a DynaBean for easy access to the
properties.
*/
- public ResultSetIterator query(String sql, List parameters) throws
SQLException, IllegalAccessException, InstantiationException {
- ResultSetIterator answer = null;
+ public Iterator query(String sql, List parameters) throws SQLException,
IllegalAccessException, InstantiationException {
+ Iterator answer = null;
Connection connection = borrowConnection();
PreparedStatement statement = null;
ResultSet resultSet = null;
@@ -552,13 +552,15 @@
/**
* Factory method to create a new ResultSetIterator for the given result set,
closing the
* connection, statement and result set when the iterator is used or closed.
+ *
+ * @todo figure out a way to close Connection, Statement and ResultSet!
*/
- protected ResultSetIterator createResultSetIterator(
+ protected Iterator createResultSetIterator(
Connection connection, Statement statement, ResultSet resultSet
) throws SQLException, IllegalAccessException, InstantiationException {
// #### WARNING - the Connection, statement and resultSet are not closed.
ResultSetDynaClass resultSetClass = new ResultSetDynaClass(resultSet);
- return (ResultSetIterator) resultSetClass.iterator();
+ return resultSetClass.iterator();
}
}
1.2 +3 -9
jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/dynabean/AbstractTestDynaSql.java
Index: AbstractTestDynaSql.java
===================================================================
RCS file:
/home/cvs/jakarta-commons-sandbox/sql/src/test/org/apache/commons/sql/dynabean/AbstractTestDynaSql.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- AbstractTestDynaSql.java 13 Sep 2002 12:14:16 -0000 1.1
+++ AbstractTestDynaSql.java 17 Sep 2002 19:56:25 -0000 1.2
@@ -66,6 +66,7 @@
import java.io.FileInputStream;
import java.io.FileWriter;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import javax.sql.DataSource;
@@ -77,7 +78,6 @@
import org.apache.commons.beanutils.DynaBean;
import org.apache.commons.beanutils.DynaClass;
-import org.apache.commons.beanutils.ResultSetIterator;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -203,7 +203,7 @@
* Test out some basic query operations
*/
protected void doQuery() throws Exception {
- ResultSetIterator iter = dynaSql.query( "select * from book" );
+ Iterator iter = dynaSql.query( "select * from book" );
assertTrue("Found at least one row", iter.hasNext());
DynaBean bean = (DynaBean) iter.next();
@@ -212,9 +212,6 @@
log.info( "Found book: " + bean.get("title") );
- assertEquals( "iter has corrrect isbn", "ISBN-ABCDEF", iter.get("isbn") );
- assertEquals( "iter has corrrect title", "The Importance of being Earnest",
iter.get("title") );
-
assertEquals( "bean has corrrect isbn", "ISBN-ABCDEF", bean.get("isbn") );
assertEquals( "bean has corrrect title", "The Importance of being Earnest",
bean.get("title") );
}
@@ -226,7 +223,7 @@
List params = new ArrayList();
params.add("The Hanging Garden");
- ResultSetIterator iter = dynaSql.query( "select * from book where title =
?", params );
+ Iterator iter = dynaSql.query( "select * from book where title = ?", params
);
assertTrue("Found at least one row", iter.hasNext());
DynaBean bean = (DynaBean) iter.next();
@@ -235,9 +232,6 @@
log.info( "Found book: " + bean.get("title") );
- assertEquals( "iter has corrrect isbn", "ISBN-XYZ", iter.get("isbn") );
- assertEquals( "iter has corrrect title", "The Hanging Garden",
iter.get("title") );
-
assertEquals( "bean has corrrect isbn", "ISBN-XYZ", bean.get("isbn") );
assertEquals( "bean has corrrect title", "The Hanging Garden",
bean.get("title") );
}
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
