[#7171] Better exception formatting (adding ... around abbreviated SQ…

…L strings)
jOOQ · Mar 9, 2018 · 57b98bc · 57b98bc
1 parent feb2f43
commit 57b98bc
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 5 deletions.
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserException.java b/jOOQ/src/main/java/org/jooq/impl/ParserException.java
@@ -37,8 +37,6 @@
  */
 package org.jooq.impl;
 
-import static org.jooq.exception.SQLStateSubclass.C42000_NO_SUBCLASS;
-
 import org.jooq.DSLContext;
 import org.jooq.exception.DataAccessException;
 import org.jooq.exception.SQLStateSubclass;
@@ -65,15 +63,19 @@ public ParserException(String sql) {
     }
 
     public ParserException(String sql, String message) {
-        this(sql, message, C42000_NO_SUBCLASS);
+        this(sql, message, null);
     }
 
     public ParserException(String sql, String message, SQLStateSubclass state) {
         this(sql, message, state, null);
     }
 
     public ParserException(String sql, String message, SQLStateSubclass state, Throwable cause) {
-        super(state + ": " + (message == null ? "" : message + ": ") + sql, cause);
+        super(
+            (state == null ? "" : state + ": ")
+          + (message == null ? "" : message + ": ")
+          + sql, cause
+        );
 
         this.sql = sql;
     }

diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -7338,7 +7338,12 @@ boolean done(String message) {
 
         String mark() {
             int[] line = line();
-            return "[" + line[0] + ":" + line[1] + "] " + sqlString.substring(Math.max(0, position - 50), position) + "[*]" + sqlString.substring(position, Math.min(sqlString.length(), position + 80));
+            return "[" + line[0] + ":" + line[1] + "] "
+                  + (position > 50 ? "..." : "")
+                  + sqlString.substring(Math.max(0, position - 50), position)
+                  + "[*]"
+                  + sqlString.substring(position, Math.min(sqlString.length(), position + 80))
+                  + (sqlString.length() > position + 80 ? "..." : "");
         }
 
         @Override