Author: cbegin
Date: Mon Jun 5 14:10:41 2006
New Revision: 411917
URL: http://svn.apache.org/viewvc?rev=411917&view=rev
Log:
1) Fix for iBATIS-269: check for multiple result set support
2) Added xalan JAR files so that build works with JDK 1.5 (need to update Ant
etc.)
3) Updated release.txt with most recent releases.
Added:
ibatis/trunk/java/mapper/mapper2/devlib/serializer.jar (with props)
ibatis/trunk/java/mapper/mapper2/devlib/xalan.jar (with props)
Modified:
ibatis/trunk/java/mapper/mapper2/build/version.properties
ibatis/trunk/java/mapper/mapper2/doc/release.txt
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java
Modified: ibatis/trunk/java/mapper/mapper2/build/version.properties
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/build/version.properties?rev=411917&r1=411916&r2=411917&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/build/version.properties (original)
+++ ibatis/trunk/java/mapper/mapper2/build/version.properties Mon Jun 5
14:10:41 2006
@@ -1,5 +1,5 @@
#Build version info
-#Sat Jun 03 07:58:56 MDT 2006
+#Mon Jun 05 15:03:40 MDT 2006
version=2.1.7
-buildDate=2006/06/03 07\:58
-buildNum=608
+buildDate=2006/06/05 15\:03
+buildNum=612
Added: ibatis/trunk/java/mapper/mapper2/devlib/serializer.jar
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/devlib/serializer.jar?rev=411917&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ibatis/trunk/java/mapper/mapper2/devlib/serializer.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Added: ibatis/trunk/java/mapper/mapper2/devlib/xalan.jar
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/devlib/xalan.jar?rev=411917&view=auto
==============================================================================
Binary file - no diff available.
Propchange: ibatis/trunk/java/mapper/mapper2/devlib/xalan.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: ibatis/trunk/java/mapper/mapper2/doc/release.txt
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/doc/release.txt?rev=411917&r1=411916&r2=411917&view=diff
==============================================================================
--- ibatis/trunk/java/mapper/mapper2/doc/release.txt (original)
+++ ibatis/trunk/java/mapper/mapper2/doc/release.txt Mon Jun 5 14:10:41 2006
@@ -7,9 +7,28 @@
o Removed iBATIS 1.x compatibility libraries, they are no longer supported.
o Removed deprectated JtaDaoTemplate
+ o Removed custom nested transactions (JDBC 1.4 now required)
+ o Added support for ResultSet OUT params from stored procs (e.g. Oracle Ref
Cursor)
o Fixed IBATIS-281 Nested iterate tags are broken
o Fixed IBATIS-293 Certain dynamic tags do not work within an iterate
(<isNull>, <isEmpty>, etc.)
-
+ o Fixed IBATIS-250: SELECT statement returns unexpected result when 'groupBy'
and 'nullValue' are specified in resultMaps.
+ o Fixed IBATIS-258: invalid DOCTYPE. Changed the DOCTYPE to the
ibatis.apache.org
+ o Fixed JIRA IBATIS-249: "Race conditions in Throttle lead to thread blockage
popping items from ThrottledPools under stress"
+ o Fixed IBATIS-260: "Hash conflict with groupBy resultMaps"
+ o Fixed IBATIS-263 to allow type aliases to be case insensitive.
+ o Fixed IBATIS-167: "Improvements in SimpleDataSource"
+ o Fixed IBATIS-109: "Make PaginatedList work with IBM's broken JDBC driver"
+ o Fixed IBATIS-230: "Warn when 2 ids of a <sql> tag are the identical"
+ o Fixed IBATIS-210/224 that will allow the use of enums in Java 1.5 while
still being backward compatible with 1.4
+ o Fixed IBATIS-204 "Cache layer does no logging of puts, gets, flushes", now
it can at debug logging level.
+ o Fixed IBATIS-275, add comments only to indicate flushDataCache(string)
always uses namespace.
+ o Fixed IBATIS-127, "PropertyAccessPlan should put more context information
when throwing an exception". Fix changes the error message to include the
property causing the exception.
+ o Fixed IBATIS-281 and IBATIS-293 Nested Iterate Tags
+ o Added IBATIS-205 Change selected access modifiers from private to protected
+ o Fixed IBATIS-166 and IBATIS-271 Add overloads for common SqlMapClient
methods without parameterObject parameter
+ o Fixed IBATIS-128 - log an error if there are overloaded setter methods
+ o Added IBATIS-22 - specify statement timeouts using the JDBC driver support
+ o Fixed IBATIS-269 Added check for multiple result set support
------------------------------
2.1.7 - Jan 21, 2006
Modified:
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java
URL:
http://svn.apache.org/viewvc/ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java?rev=411917&r1=411916&r2=411917&view=diff
==============================================================================
---
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java
(original)
+++
ibatis/trunk/java/mapper/mapper2/src/com/ibatis/sqlmap/engine/execution/SqlExecutor.java
Mon Jun 5 14:10:41 2006
@@ -193,7 +193,7 @@
}
// clear out remaining results
- while (ps.getMoreResults());
+ while (getMoreResults(ps));
} finally {
try {
@@ -306,7 +306,7 @@
}
// consume additional results
- while (cs.getMoreResults());
+ while (getMoreResults(cs));
errorContext.setMoreInfo("Check the output parameters (retrieval of
output parameters failed).");
retrieveOutputParameters( request, cs, mappings, parameters, callback);
@@ -337,7 +337,7 @@
private boolean moveToNextResultSet(Statement stmt) throws SQLException {
boolean moreResults;
// This is the messed up JDBC approach for determining if there are more
results
- moreResults = !(((stmt.getMoreResults() == false) &&
(stmt.getUpdateCount() == -1)));
+ moreResults = !(((getMoreResults(stmt) == false) && (stmt.getUpdateCount()
== -1)));
return moreResults;
}
@@ -354,9 +354,12 @@
}
}
- //
- // Private Methods
- //
+ private boolean getMoreResults(Statement stmt) throws SQLException {
+ if (!stmt.getConnection().getMetaData().supportsMultipleResultSets()) {
+ return false;
+ }
+ return stmt.getMoreResults();
+ }
private void retrieveOutputParameters(RequestScope request,
CallableStatement cs, ParameterMapping[] mappings, Object[] parameters,
RowHandlerCallback callback) throws SQLException {
for (int i = 0; i < mappings.length; i++) {
