SQL query parser error handling fix

Former-commit-id: eb094070

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/model/sql/parser/SQLSemanticProcessor.java

@@ -59,7 +59,7 @@ public class SQLSemanticProcessor {
             return statement instanceof Select &&
                 ((Select) statement).getSelectBody() instanceof PlainSelect &&
                 ((PlainSelect) ((Select) statement).getSelectBody()).getInto() == null;
-        } catch (Exception e) {
+        } catch (Throwable e) {
             //log.debug(e);
             return false;
         }
@@ -77,7 +77,7 @@ public class SQLSemanticProcessor {
                 }
             }
             return wrapQuery(dataSource, sqlQuery, dataFilter);
-        } catch (Exception e) {
+        } catch (Throwable e) {
             throw new DBException("SQL parse error", e);
         }
     }

plugins/org.jkiss.dbeaver.core/src/org/jkiss/dbeaver/runtime/sql/SQLQueryJob.java

@@ -25,6 +25,7 @@ import org.eclipse.core.runtime.Status;
 import org.eclipse.jface.dialogs.IDialogConstants;
 import org.eclipse.jface.preference.IPreferenceStore;
 import org.eclipse.ui.IWorkbenchPartSite;
+import org.jkiss.dbeaver.DBException;
 import org.jkiss.dbeaver.DBeaverPreferences;
 import org.jkiss.dbeaver.core.DBeaverCore;
 import org.jkiss.dbeaver.model.DBPDataKind;
@@ -420,13 +421,13 @@ public class SQLQueryJob extends DataSourceJob
                 }
             }
         }
-        catch (DBCException ex) {
+        catch (Throwable ex) {
+            if (!(ex instanceof DBException)) {
+                log.error("Unexpected error while processing SQL", ex);
+            }
             curResult.setError(ex);
             lastError = ex;
         }
-        catch (Throwable ex) {
-            log.error("Unexpected error while processing SQL", ex);
-        }
         curResult.setQueryTime(System.currentTimeMillis() - startTime);
 
         if (fireEvents && listener != null) {