From 429b2327e4c977c9c1ac6f595960a508f1b0f8e4 Mon Sep 17 00:00:00 2001
From: BerndBreier <33351391+BerndBreier@users.noreply.github.com>
Date: Mon, 15 Jan 2018 15:24:58 +0100
Subject: [PATCH] TSK-152 fix problem with drop table if exists

---
 .../pro/taskana/impl/configuration/DBCleaner.java | 15 +++++++++------
 1 file changed, 9 insertions(+), 6 deletions(-)

diff --git a/lib/taskana-core/src/test/java/pro/taskana/impl/configuration/DBCleaner.java b/lib/taskana-core/src/test/java/pro/taskana/impl/configuration/DBCleaner.java
index 6f39301a0..2673e030c 100644
--- a/lib/taskana-core/src/test/java/pro/taskana/impl/configuration/DBCleaner.java
+++ b/lib/taskana-core/src/test/java/pro/taskana/impl/configuration/DBCleaner.java
@@ -11,13 +11,13 @@ import javax.sql.DataSource;
 import org.apache.ibatis.jdbc.ScriptRunner;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import pro.taskana.configuration.DbSchemaCreator;
 
 /**
  * This class cleans the complete database. Only to be used in Unittest
  */
 public class DBCleaner {
-    private static final Logger LOGGER = LoggerFactory.getLogger(DbSchemaCreator.class);
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(DBCleaner.class);
     private static final String DB_CLEAR_SCRIPT = "/sql/clear-db.sql";
     private static final String DB_DROP_TABLES_SCRIPT = "/sql/drop-tables.sql";
 
@@ -26,10 +26,11 @@ public class DBCleaner {
     private StringWriter errorWriter = new StringWriter();
     private PrintWriter errorLogWriter = new PrintWriter(errorWriter);
 
-
     /**
      * Clears the db.
-     * @param dropTables if true drop tables, else clean tables
+     *
+     * @param dropTables
+     *            if true drop tables, else clean tables
      * @throws SQLException
      */
     public void clearDb(DataSource dataSource, boolean dropTables) throws SQLException {
@@ -37,7 +38,7 @@ public class DBCleaner {
             ScriptRunner runner = new ScriptRunner(connection);
             LOGGER.debug(connection.getMetaData().toString());
 
-            runner.setStopOnError(true);
+            runner.setStopOnError(false);
             runner.setLogWriter(logWriter);
             runner.setErrorLogWriter(errorLogWriter);
             if (dropTables) {
@@ -50,7 +51,9 @@ public class DBCleaner {
             LOGGER.error("caught Exception " + e);
         }
         LOGGER.debug(outWriter.toString());
-        if (!errorWriter.toString().trim().isEmpty()) {
+        String errorMsg = errorWriter.toString().trim();
+
+        if (!errorMsg.isEmpty() && errorMsg.indexOf("SQLCODE=-204, SQLSTATE=42704") == -1) {
             LOGGER.error(errorWriter.toString());
         }
     }