From f46c1d230f2de9fbbf6c61d7780c0b706b87c7f8 Mon Sep 17 00:00:00 2001
From: Zoran Zaric <zz@zoranzaric.de>
Date: Mon, 30 Oct 2017 15:04:08 +0100
Subject: [PATCH] Add exception handling to non selects

---
 src/main/java/at/compax/tools/sql/SqlExecutor.java  | 11 +++++++++--
 src/main/java/at/compax/tools/sql/model/Result.java |  5 +++++
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/src/main/java/at/compax/tools/sql/SqlExecutor.java b/src/main/java/at/compax/tools/sql/SqlExecutor.java
index 8ed37b8..f8e1f6e 100644
--- a/src/main/java/at/compax/tools/sql/SqlExecutor.java
+++ b/src/main/java/at/compax/tools/sql/SqlExecutor.java
@@ -41,8 +41,15 @@ public class SqlExecutor {
     @Cleanup
     Statement stmt = conn.createStatement();
 
-    stmt.execute(sql.trim());
-    log.info("Executed");
+    try {
+      stmt.execute(sql.trim());
+      log.info("Executed");
+    } catch (SQLException e) {
+      return Result.builder() //
+          .exception(e.getClass().getName()) //
+          .exceptionMessage(e.getMessage()) //
+          .build();
+    }
 
     ResultBuilder resultBuilder = Result.builder();
 
diff --git a/src/main/java/at/compax/tools/sql/model/Result.java b/src/main/java/at/compax/tools/sql/model/Result.java
index 577ff1e..62f64fe 100644
--- a/src/main/java/at/compax/tools/sql/model/Result.java
+++ b/src/main/java/at/compax/tools/sql/model/Result.java
@@ -2,6 +2,8 @@ package at.compax.tools.sql.model;
 
 import java.util.List;
 
+import com.fasterxml.jackson.annotation.JsonInclude;
+
 import lombok.Builder;
 import lombok.Getter;
 import lombok.ToString;
@@ -9,6 +11,9 @@ import lombok.ToString;
 @Builder
 @Getter
 @ToString
+@JsonInclude(JsonInclude.Include.NON_NULL)
 public class Result {
   private List<UserError> userErrors;
+  private String exception;
+  private String exceptionMessage;
 }