You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ibatis.apache.org by cb...@apache.org on 2009/01/04 06:34:12 UTC
svn commit: r731179 - in /ibatis/trunk/java/ibatis-3: ./
ibatis-3-core/src/main/java/org/apache/ibatis/api/
ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/
ibatis-3-core/src/test/java/org/apache/ibatis/api/
Author: cbegin
Date: Sat Jan 3 21:34:06 2009
New Revision: 731179
URL: http://svn.apache.org/viewvc?rev=731179&view=rev
Log:
added module derby files to ant cleanup
refactored result handler select in sqlsession
Modified:
ibatis/trunk/java/ibatis-3/common.xml
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSession.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java
ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java
ibatis/trunk/java/ibatis-3/version.properties
Modified: ibatis/trunk/java/ibatis-3/common.xml
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/common.xml?rev=731179&r1=731178&r2=731179&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/common.xml (original)
+++ ibatis/trunk/java/ibatis-3/common.xml Sat Jan 3 21:34:06 2009
@@ -59,11 +59,13 @@
<target name="clean">
<delete dir="${build.root}"/>
<delete dir="ibderby"/>
+ <delete dir="${module}/ibderby"/>
<delete>
<fileset dir="./">
<include name="junit*.properties"/>
<include name="coverage.ec"/>
<include name="derby.log"/>
+ <include name="${module}/derby.log"/>
</fileset>
</delete>
</target>
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSession.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSession.java?rev=731179&r1=731178&r2=731179&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSession.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/SqlSession.java Sat Jan 3 21:34:06 2009
@@ -12,7 +12,8 @@
List selectList(String statement);
List selectList(String statement, Object parameter);
List selectList(String statement, Object parameter, int offset, int limit);
- List selectList(String statement, Object parameter, int offset, int limit, ResultHandler handler);
+
+ void select(String statement, Object parameter, int offset, int limit, ResultHandler handler);
Object insert(String statement);
Object insert(String statement, Object parameter);
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java?rev=731179&r1=731178&r2=731179&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/main/java/org/apache/ibatis/api/defaults/DefaultSqlSession.java Sat Jan 3 21:34:06 2009
@@ -46,13 +46,18 @@
}
public List selectList(String statement, Object parameter, int offset, int limit) {
- return selectList(statement, parameter, offset, limit, Executor.NO_RESULT_HANDLER);
+ try {
+ MappedStatement ms = configuration.getMappedStatement(statement);
+ return executor.query(ms, parameter, offset, limit, Executor.NO_RESULT_HANDLER);
+ } catch (Exception e) {
+ throw ExceptionFactory.wrapException("Error querying database. Cause: " + e, e);
+ }
}
- public List selectList(String statement, Object parameter, int offset, int limit, ResultHandler handler) {
+ public void select(String statement, Object parameter, int offset, int limit, ResultHandler handler) {
try {
MappedStatement ms = configuration.getMappedStatement(statement);
- return executor.query(ms, parameter, offset, limit, handler);
+ executor.query(ms, parameter, offset, limit, handler);
} catch (Exception e) {
throw ExceptionFactory.wrapException("Error querying database. Cause: " + e, e);
}
Modified: ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java?rev=731179&r1=731178&r2=731179&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java (original)
+++ ibatis/trunk/java/ibatis-3/ibatis-3-core/src/test/java/org/apache/ibatis/api/SqlSessionTest.java Sat Jan 3 21:34:06 2009
@@ -49,6 +49,19 @@
}
@Test
+ public void shouldSelectOneAuthorAsList() throws Exception {
+ SqlSession session = sqlMapper.openSession();
+ try {
+ List<Author> authors= session.selectList(
+ "com.domain.AuthorMapper.selectAuthor", new Author(101));
+ Assert.assertEquals(101, authors.get(0).getId());
+ Assert.assertEquals(Section.NEWS, authors.get(0).getFavouriteSection());
+ } finally {
+ session.close();
+ }
+ }
+
+ @Test
public void shouldSelectOneImmutableAuthor() throws Exception {
SqlSession session = sqlMapper.openSession();
try {
Modified: ibatis/trunk/java/ibatis-3/version.properties
URL: http://svn.apache.org/viewvc/ibatis/trunk/java/ibatis-3/version.properties?rev=731179&r1=731178&r2=731179&view=diff
==============================================================================
--- ibatis/trunk/java/ibatis-3/version.properties (original)
+++ ibatis/trunk/java/ibatis-3/version.properties Sat Jan 3 21:34:06 2009
@@ -1,5 +1,5 @@
#Build version info
-#Sat Jan 03 21:48:44 MST 2009
+#Sat Jan 03 22:28:07 MST 2009
version=3.0.0
-buildDate=2009/01/03 21\:48
-buildNum=102
+buildDate=2009/01/03 22\:28
+buildNum=104