From 445ae1637a70e3607d8816d4199cb8c1594302a0 Mon Sep 17 00:00:00 2001
From: dsyer <dsyer@2e8e966d-6415-0410-94b9-dc4e65435d03>
Date: Wed, 12 Dec 2007 23:24:36 +0000
Subject: [PATCH] Add flag for ignoring failed drop statement

---
 .../datasource/InitializingDataSourceFactoryBean.java  | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/spring-batch-samples/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java b/spring-batch-samples/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java
index 774de02e0..7eb5d6fc5 100644
--- a/spring-batch-samples/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java
+++ b/spring-batch-samples/src/test/java/test/jdbc/datasource/InitializingDataSourceFactoryBean.java
@@ -41,7 +41,9 @@ public class InitializingDataSourceFactoryBean extends AbstractFactoryBean {
 
 	private Resource destroyScript;
 
-	DataSource dataSource;
+	private DataSource dataSource;
+	
+	private boolean ignoreFailedDrop = true;
 
 	private static boolean initialized = false;
 
@@ -116,7 +118,7 @@ public class InitializingDataSourceFactoryBean extends AbstractFactoryBean {
 						try {
 							jdbcTemplate.execute(script);
 						} catch (DataAccessException e) {
-							if (script.toLowerCase().startsWith("drop")) {
+							if (ignoreFailedDrop && script.toLowerCase().startsWith("drop")) {
 								logger.debug("DROP script failed (ignoring): "+script);
 							} else {
 								throw e;
@@ -161,5 +163,9 @@ public class InitializingDataSourceFactoryBean extends AbstractFactoryBean {
 	public void setDataSource(DataSource dataSource) {
 		this.dataSource = dataSource;
 	}
+	
+	public void setIgnoreFailedDrop(boolean ignoreFailedDrop) {
+		this.ignoreFailedDrop = ignoreFailedDrop;
+	}
 
 }