From bb7d2359008260e7d427923d0b64ad245956e8f6 Mon Sep 17 00:00:00 2001 From: Glenn Renfro Date: Fri, 6 Nov 2020 17:14:08 -0500 Subject: [PATCH] Updated test to clean out tables using delete instead of truncate --- .../JdbcItemWriterAutoConfigurationTests.java | 8 ++++++-- .../src/test/resources/schema-h2.sql | 18 +++++++++--------- 2 files changed, 15 insertions(+), 11 deletions(-) diff --git a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcItemWriterAutoConfigurationTests.java b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcItemWriterAutoConfigurationTests.java index 4908b125..1a48a3cb 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcItemWriterAutoConfigurationTests.java +++ b/spring-cloud-starter-single-step-batch-job/src/test/java/org/springframework/cloud/task/batch/autoconfigure/jdbc/JdbcItemWriterAutoConfigurationTests.java @@ -87,8 +87,12 @@ public class JdbcItemWriterAutoConfigurationTests { dataSource.setPassword(DATASOURCE_USER_PASSWORD); JdbcTemplate jdbcTemplate = new JdbcTemplate(dataSource); jdbcTemplate.execute("TRUNCATE TABLE item"); - jdbcTemplate.execute("DROP TABLE BATCH_JOB_EXECUTION CASCADE"); - jdbcTemplate.execute("DROP TABLE BATCH_JOB_INSTANCE CASCADE"); + jdbcTemplate.execute("DELETE FROM BATCH_STEP_EXECUTION_CONTEXT"); + jdbcTemplate.execute("DELETE FROM BATCH_STEP_EXECUTION"); + jdbcTemplate.execute("DELETE FROM BATCH_JOB_EXECUTION_PARAMS"); + jdbcTemplate.execute("DELETE FROM BATCH_JOB_EXECUTION_CONTEXT"); + jdbcTemplate.execute("DELETE FROM BATCH_JOB_EXECUTION"); + jdbcTemplate.execute("DELETE FROM BATCH_JOB_INSTANCE"); } @Test diff --git a/spring-cloud-starter-single-step-batch-job/src/test/resources/schema-h2.sql b/spring-cloud-starter-single-step-batch-job/src/test/resources/schema-h2.sql index 2186d664..1f86054b 100644 --- a/spring-cloud-starter-single-step-batch-job/src/test/resources/schema-h2.sql +++ b/spring-cloud-starter-single-step-batch-job/src/test/resources/schema-h2.sql @@ -2,7 +2,7 @@ CREATE TABLE IF NOT EXISTS item ( item_name varchar(55) ); -CREATE TABLE BATCH_JOB_INSTANCE ( +CREATE TABLE IF NOT EXISTS BATCH_JOB_INSTANCE ( JOB_INSTANCE_ID BIGINT IDENTITY NOT NULL PRIMARY KEY , VERSION BIGINT , JOB_NAME VARCHAR(100) NOT NULL, @@ -10,7 +10,7 @@ CREATE TABLE BATCH_JOB_INSTANCE ( constraint JOB_INST_UN unique (JOB_NAME, JOB_KEY) ) ; -CREATE TABLE BATCH_JOB_EXECUTION ( +CREATE TABLE IF NOT EXISTS BATCH_JOB_EXECUTION ( JOB_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY , VERSION BIGINT , JOB_INSTANCE_ID BIGINT NOT NULL, @@ -26,7 +26,7 @@ CREATE TABLE BATCH_JOB_EXECUTION ( references BATCH_JOB_INSTANCE(JOB_INSTANCE_ID) ) ; -CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( +CREATE TABLE IF NOT EXISTS BATCH_JOB_EXECUTION_PARAMS ( JOB_EXECUTION_ID BIGINT NOT NULL , TYPE_CD VARCHAR(6) NOT NULL , KEY_NAME VARCHAR(100) NOT NULL , @@ -39,7 +39,7 @@ CREATE TABLE BATCH_JOB_EXECUTION_PARAMS ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; -CREATE TABLE BATCH_STEP_EXECUTION ( +CREATE TABLE IF NOT EXISTS BATCH_STEP_EXECUTION ( STEP_EXECUTION_ID BIGINT IDENTITY NOT NULL PRIMARY KEY , VERSION BIGINT NOT NULL, STEP_NAME VARCHAR(100) NOT NULL, @@ -62,7 +62,7 @@ CREATE TABLE BATCH_STEP_EXECUTION ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; -CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( +CREATE TABLE IF NOT EXISTS BATCH_STEP_EXECUTION_CONTEXT ( STEP_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY, SHORT_CONTEXT VARCHAR(2500) NOT NULL, SERIALIZED_CONTEXT LONGVARCHAR , @@ -70,7 +70,7 @@ CREATE TABLE BATCH_STEP_EXECUTION_CONTEXT ( references BATCH_STEP_EXECUTION(STEP_EXECUTION_ID) ) ; -CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT ( +CREATE TABLE IF NOT EXISTS BATCH_JOB_EXECUTION_CONTEXT ( JOB_EXECUTION_ID BIGINT NOT NULL PRIMARY KEY, SHORT_CONTEXT VARCHAR(2500) NOT NULL, SERIALIZED_CONTEXT LONGVARCHAR , @@ -78,6 +78,6 @@ CREATE TABLE BATCH_JOB_EXECUTION_CONTEXT ( references BATCH_JOB_EXECUTION(JOB_EXECUTION_ID) ) ; -CREATE SEQUENCE BATCH_STEP_EXECUTION_SEQ; -CREATE SEQUENCE BATCH_JOB_EXECUTION_SEQ; -CREATE SEQUENCE BATCH_JOB_SEQ; +CREATE SEQUENCE IF NOT EXISTS BATCH_STEP_EXECUTION_SEQ; +CREATE SEQUENCE IF NOT EXISTS BATCH_JOB_EXECUTION_SEQ; +CREATE SEQUENCE IF NOT EXISTS BATCH_JOB_SEQ;