Spring/spring-batch
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

BATCH-970: made the transaction participation configurable

Browse Source
This commit is contained in:
trisberg
2008-12-15 17:20:17 +00:00
parent dabfda5cb3
commit 159ba9564e
2 changed files with 34 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
spring-batch-infrastructure/src/main/java/org/springframework/batch/item/database/JdbcCursorItemReader.java
View File

@@ -134,7 +134,9 @@ public class JdbcCursorItemReader extends AbstractBufferedItemReaderItemStream i
private boolean driverSupportsAbsolute = false;
public JdbcCursorItemReader() {
private boolean participateInExistingTransaction = false;
public JdbcCursorItemReader() {
setName(ClassUtils.getShortName(JdbcCursorItemReader.class));
}
@@ -171,8 +173,13 @@ public class JdbcCursorItemReader extends AbstractBufferedItemReaderItemStream i
Assert.state(dataSource != null, "DataSource must not be null.");
try {
this.con = DataSourceUtils.getConnection(dataSource);
preparedStatement = this.con.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
if (participateInExistingTransaction) {
this.con = DataSourceUtils.getConnection(dataSource);
}
else {
this.con = dataSource.getConnection();
}
preparedStatement = this.con.prepareStatement(sql, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY,
ResultSet.HOLD_CURSORS_OVER_COMMIT);
applyStatementSettings(preparedStatement);
if (this.preparedStatementSetter != null) {
@@ -380,6 +387,19 @@ public class JdbcCursorItemReader extends AbstractBufferedItemReaderItemStream i
this.driverSupportsAbsolute = driverSupportsAbsolute;
}
/**
* Indicate whether the cursor should be opened as part of an existing transaction or if it
* should be opened in its own transaction. The default is for the cursor to be opened in its
* own transaction. If you set this flag to true then you should wrap the DataSource in a
* {@link org.springframework.jdbc.datasource.SingleConnectionDataSource} to prevent the
* connection from being closed after each commit.
*
* @param participateInExistingTransaction <code>false</code> by default
*/
public void setParticipateInExistingTransaction(boolean participateInExistingTransaction) {
this.participateInExistingTransaction = participateInExistingTransaction;
}
/**
* Check the result set is in synch with the currentRow attribute. This is
* important to ensure that the user hasn't modified the current row.

13
spring-batch-infrastructure/src/test/java/org/springframework/batch/item/database/JdbcCursorItemReaderConfigTests.java
View File

@@ -18,10 +18,17 @@ import java.sql.ResultSet;
public class JdbcCursorItemReaderConfigTests extends TestCase {
/*
* Should fail if trying to call getConnection() twice
*/
public void testUsesCurrentTransaction() throws Exception {
//TODO:
}
/*
* Should fail if trying to call getConnection() twice
* Should not fail if trying to call getConnection() twice
*/
public void testUsesCurrentTransaction() throws Exception {
public void testUsesItsOwnTransaction() throws Exception {
MockControl ctrlDataSource;
DataSource mockDataSource;
MockControl ctrlConnection;
@@ -59,6 +66,8 @@ public class JdbcCursorItemReaderConfigTests extends TestCase {
mockDataSource = (DataSource) ctrlDataSource.getMock();
mockDataSource.getConnection();
ctrlDataSource.setReturnValue(mockConnection);
mockDataSource.getConnection();
ctrlDataSource.setReturnValue(mockConnection);
ctrlResultSet.replay();
ctrlDataSource.replay();