root
/
spring-framework
mirror of https://github.com/spring-projects/spring-framework.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #26 from trisberg/improved-RDP

This commit is contained in:
Chris Beams 2012-02-06 09:00:29 +01:00
parent 025b8abfaf 2ffa4725cd
commit ff84419f4d
3 changed files with 23 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
org.springframework.jdbc/src/main/java/org/springframework/jdbc/datasource/init/ResourceDatabasePopulator.java
View File

@ -181,9 +181,10 @@ public class ResourceDatabasePopulator implements DatabasePopulator {
for (String statement : statements) { for (String statement : statements) {
lineNumber++; lineNumber++;
try { try {
int rowsAffected = stmt.executeUpdate(statement); stmt.execute(statement);
int rowsAffected = stmt.getUpdateCount();
if (logger.isDebugEnabled()) { if (logger.isDebugEnabled()) {
logger.debug(rowsAffected + " rows affected by SQL: " + statement); logger.debug(rowsAffected + " returned as updateCount for SQL: " + statement);
} }
} }
catch (SQLException ex) { catch (SQLException ex) {

21
org.springframework.jdbc/src/test/java/org/springframework/jdbc/datasource/init/DatabasePopulatorTests.java
View File

@ -20,8 +20,6 @@ import static org.junit.Assert.assertEquals;
import java.sql.Connection; import java.sql.Connection;
import javax.sql.DataSource;
import org.junit.After; import org.junit.After;
import org.junit.Test; import org.junit.Test;
import org.springframework.core.io.ClassRelativeResourceLoader; import org.springframework.core.io.ClassRelativeResourceLoader;
@ -49,7 +47,7 @@ public class DatabasePopulatorTests {
assertEquals(name, jdbcTemplate.queryForObject("select NAME from T_TEST", String.class)); assertEquals(name, jdbcTemplate.queryForObject("select NAME from T_TEST", String.class));
} }
private void assertUsersDatabaseCreated(DataSource db) { private void assertUsersDatabaseCreated() {
assertEquals("Sam", jdbcTemplate.queryForObject("select first_name from users where last_name = 'Brannen'", assertEquals("Sam", jdbcTemplate.queryForObject("select first_name from users where last_name = 'Brannen'",
String.class)); String.class));
} }
@ -191,7 +189,22 @@ public class DatabasePopulatorTests {
connection.close(); connection.close();
} }
assertUsersDatabaseCreated(db); assertUsersDatabaseCreated();
}
@Test
public void testBuildWithSelectStatements() throws Exception {
databasePopulator.addScript(resourceLoader.getResource("db-schema.sql"));
databasePopulator.addScript(resourceLoader.getResource("db-test-data-select.sql"));
Connection connection = db.getConnection();
try {
databasePopulator.populate(connection);
} finally {
connection.close();
}
assertEquals(1, jdbcTemplate.queryForInt("select COUNT(NAME) from T_TEST where NAME='Keith'"));
assertEquals(1, jdbcTemplate.queryForInt("select COUNT(NAME) from T_TEST where NAME='Dave'"));
} }
} }

3
org.springframework.jdbc/src/test/resources/org/springframework/jdbc/datasource/init/db-test-data-select.sql Normal file
View File

@ -0,0 +1,3 @@
insert into T_TEST (NAME) values ('Keith');
insert into T_TEST (NAME) values ('Dave');
select NAME from T_TEST where NAME = 'Keith';