From 7632f29c4a208b3fe5a1caaa8a3d9c1bf1442152 Mon Sep 17 00:00:00 2001 From: lucasward Date: Wed, 6 Feb 2008 03:43:53 +0000 Subject: [PATCH] BATCH-337:No *Instance domain objects (or their respective tables) contain a 'status'. Instead, they contain the 'last execution', which can be used to determinte the status. RestartData is also no longer necessary, as everything can be 'restored' by calling stepInstance.getLastExecution().getExecutionAttributes(). Also changed all 'ID' columns to be complete, such as 'JOB_INSTANCE_ID' rather than just 'ID'. --- .../batch/sample/dao/JdbcJobRepositoryTests.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java index d1981ea94..dd5482d19 100644 --- a/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java +++ b/spring-batch-samples/src/test/java/org/springframework/batch/sample/dao/JdbcJobRepositoryTests.java @@ -55,17 +55,17 @@ public class JdbcJobRepositoryTests extends AbstractTransactionalDataSourceSprin startNewTransaction(); for (Iterator iterator = jobExecutionIds.iterator(); iterator.hasNext();) { Long id = (Long) iterator.next(); - getJdbcTemplate().update("DELETE FROM BATCH_JOB_EXECUTION where ID=?", new Object[] { id }); + getJdbcTemplate().update("DELETE FROM BATCH_JOB_EXECUTION where JOB_EXECUTION_ID=?", new Object[] { id }); } for (Iterator iterator = jobIds.iterator(); iterator.hasNext();) { Long id = (Long) iterator.next(); - getJdbcTemplate().update("DELETE FROM BATCH_JOB_INSTANCE where ID=?", new Object[] { id }); + getJdbcTemplate().update("DELETE FROM BATCH_JOB_INSTANCE where JOB_INSTANCE_ID=?", new Object[] { id }); } setComplete(); endTransaction(); for (Iterator iterator = jobIds.iterator(); iterator.hasNext();) { Long id = (Long) iterator.next(); - int count = getJdbcTemplate().queryForInt("SELECT COUNT(*) FROM BATCH_JOB_INSTANCE where ID=?", new Object[] { id }); + int count = getJdbcTemplate().queryForInt("SELECT COUNT(*) FROM BATCH_JOB_INSTANCE where JOB_INSTANCE_ID=?", new Object[] { id }); assertEquals(0, count); } } @@ -123,7 +123,7 @@ public class JdbcJobRepositoryTests extends AbstractTransactionalDataSourceSprin execution.setEndTime(new Timestamp(System.currentTimeMillis())); repository.saveOrUpdate(execution); JobInstance job = execution.getJobInstance(); - job.setStatus(BatchStatus.FAILED); + execution.setStatus(BatchStatus.FAILED); repository.update(job); setComplete(); endTransaction();