Bug fix: SQL editor: UNION keyword was marked red as error.

Feature: Upgraded JSQL-Parser (https://github.com/JSQLParser/JSqlParser) to version 5.1.

Author: gerdwagner

sql12/core/doc/changes.txt

@@ -6,6 +6,8 @@ Not yet released, available in our GIT repository, snapshots and future releases
 
 Enhancements:
 
+Upgraded JSQL-Parser (https://github.com/JSQLParser/JSqlParser) to version 5.1.
+
 Look and Feel Plugin: The Look and Feel preferences now allows to adjust several controls,
   e.g the SQL editor and the message panel, to dark Look and Feels.
   See menu File -- > Global Preferences --> tab "L & F"
@@ -128,6 +130,8 @@ Table cell data popup now offers find, Xml/Json-reformatting and export function
 
 Bug fixes:
 
+SQL editor: UNION keyword was marked red as error.
+
 Look and Feel Plugin: Cleaned up L&F Preferences UI.
 
 #1532 MS Excel export: Fixed NoSuchMethodError

sql12/core/lib/jsqlparser-4.3.jar

@@ -1,14 +1,14 @@
 package net.sourceforge.squirrel_sql.client.session.parser.kernel;
 
-import java.util.ArrayList;
-
 import net.sf.jsqlparser.parser.CCJSqlParser;
 import net.sf.jsqlparser.parser.ParseException;
 import net.sf.jsqlparser.parser.StringProvider;
 import net.sf.jsqlparser.schema.Table;
 import net.sf.jsqlparser.statement.Statement;
 import net.sf.jsqlparser.util.TablesNamesFinder;
 
+import java.util.ArrayList;
+
 public class JSqlParserAdapter
 {
    static ParsingResult executeParsing(StatementBounds statementBounds) throws ParseException
@@ -20,14 +20,24 @@ static ParsingResult executeParsing(StatementBounds statementBounds) throws Pars
 
       TablesNamesFinder tablesNamesFinder = new TablesNamesFinder()
       {
+         //@Override
+         //public void visit(Table table)
+         //{
+         //   if( null != table )
+         //   {
+         //      tables.add(table);
+         //   }
+         //   super.visit(table);
+         //}
+
          @Override
-         public void visit(Table table)
+         protected String extractTableName(Table table)
          {
-            if( null != table )
+            if( null != table && false == tables.contains(table))
             {
-               super.visit(table);
                tables.add(table);
             }
+            return super.extractTableName(table);
          }
       };
 

sql12/core/lib/jsqlparser-5.1.jar

@@ -12,6 +12,8 @@ static int predictNextStatementBegin(String sqlEditorText, int startPos, ParseTe
       int openBracketsCount = 0;
       int literalDelimsCount = 0;
 
+      UnionKeyWordCheck unionKeyWordCheck = new UnionKeyWordCheck();
+
       while( sqlEditorText.length() > ret)
       {
          if ('\'' == sqlEditorText.charAt(ret))
@@ -24,22 +26,21 @@ static int predictNextStatementBegin(String sqlEditorText, int startPos, ParseTe
 
          if (false == sqlCommentHelper.isInComment(ret) && false == SqlLiteralHelper.isInLiteral(literalDelimsCount))
          {
-            if ('(' == sqlEditorText.charAt(ret))
+            if('(' == sqlEditorText.charAt(ret))
             {
                ++openBracketsCount;
             }
-            else if (')' == sqlEditorText.charAt(ret))
+            else if(')' == sqlEditorText.charAt(ret))
             {
-                  --openBracketsCount;
+               --openBracketsCount;
             }
          }
 
-
          if(
                false == SqlLiteralHelper.isInLiteral(literalDelimsCount)
             && false == sqlCommentHelper.isInComment(ret)
             && false == isInBrackets(openBracketsCount)
-            && startsWithBeginKeyWord(sqlEditorText, ret)
+            && startsWithBeginKeyWord(sqlEditorText, ret, unionKeyWordCheck)
            )
          {
             break;
@@ -62,50 +63,44 @@ private static boolean isInBrackets(int openBracketsCount)
    }
 
 
-   private static boolean startsWithBeginKeyWord(String sqlEditorText, int ret)
+   private static boolean startsWithBeginKeyWord(String sqlEditorText, int beginPos, UnionKeyWordCheck unionKeyWordCheck)
    {
-      return   startsWithIgnoreCase(sqlEditorText,ret, "SELECT")
-            || startsWithIgnoreCase(sqlEditorText, ret, "UPDATE")
-            || startsWithIgnoreCase(sqlEditorText, ret, "DELETE")
-            || startsWithIgnoreCase(sqlEditorText, ret, "INSERT")
-            || startsWithIgnoreCase(sqlEditorText, ret, "ALTER")
-            || startsWithIgnoreCase(sqlEditorText, ret, "CREATE")
-            || startsWithIgnoreCase(sqlEditorText, ret, "DROP");
-   }
 
-   private static boolean startsWithIgnoreCase(String sqlEditorText, int ret, String keyWord)
-   {
-      int beginPos = ret;
-      int endPos;
+      boolean ret = isSelectBegin(sqlEditorText, beginPos, unionKeyWordCheck)
+            || StatementBeginPredictionUtil.startsWithIgnoreCase(sqlEditorText, beginPos, "UPDATE")
+            || StatementBeginPredictionUtil.startsWithIgnoreCase(sqlEditorText, beginPos, "DELETE")
+            || StatementBeginPredictionUtil.startsWithIgnoreCase(sqlEditorText, beginPos, "INSERT")
+            || StatementBeginPredictionUtil.startsWithIgnoreCase(sqlEditorText, beginPos, "ALTER")
+            || StatementBeginPredictionUtil.startsWithIgnoreCase(sqlEditorText, beginPos, "CREATE")
+            || StatementBeginPredictionUtil.startsWithIgnoreCase(sqlEditorText, beginPos, "DROP");
 
-      if(ret == 0)
+      if(ret)
       {
-         // Either are at teh beginning ...
-         beginPos = 0;
+         unionKeyWordCheck.reset();
       }
-      else if(Character.isWhitespace(sqlEditorText.charAt(ret-1)))
-      {
-         // or a white space must be in front of the keyword.
-         beginPos = ret;
-      }
-      else
+
+      return ret;
+   }
+
+   private static boolean isSelectBegin(String sqlEditorText, int beginPos, UnionKeyWordCheck unionKeyWordCheck)
+   {
+      unionKeyWordCheck.check(sqlEditorText, beginPos);
+      boolean isSelectStart = StatementBeginPredictionUtil.startsWithIgnoreCase(sqlEditorText, beginPos, "SELECT");
+
+      if(false == isSelectStart)
       {
          return false;
       }
 
-      if(sqlEditorText.length() == beginPos + keyWord.length())
+      if(false == unionKeyWordCheck.previousWasUnionOrUnionAll())
       {
-         endPos = beginPos + keyWord.length();
-      }
-      else if(sqlEditorText.length() > beginPos + keyWord.length() && Character.isWhitespace(sqlEditorText.charAt(beginPos + keyWord.length())))
-      {
-         endPos = beginPos + keyWord.length();
+         return true;
       }
       else
       {
+         unionKeyWordCheck.reset();
          return false;
       }
-
-      return keyWord.equalsIgnoreCase(sqlEditorText.substring(beginPos, endPos));
    }
+
 }

sql12/core/src/net/sourceforge/squirrel_sql/client/session/parser/kernel/JSqlParserAdapter.java

@@ -0,0 +1,40 @@
+package net.sourceforge.squirrel_sql.client.session.parser.kernel;
+
+public class StatementBeginPredictionUtil
+{
+   static boolean startsWithIgnoreCase(String sqlEditorText, int beginPos, String keyWord)
+   {
+      int curPos = beginPos;
+      int endPos;
+
+      if(beginPos == 0)
+      {
+         // Either are at teh beginning ...
+         curPos = 0;
+      }
+      else if(Character.isWhitespace(sqlEditorText.charAt(beginPos - 1)))
+      {
+         // or a white space must be in front of the keyword.
+         curPos = beginPos;
+      }
+      else
+      {
+         return false;
+      }
+
+      if(sqlEditorText.length() == curPos + keyWord.length())
+      {
+         endPos = curPos + keyWord.length();
+      }
+      else if(sqlEditorText.length() > curPos + keyWord.length() && Character.isWhitespace(sqlEditorText.charAt(curPos + keyWord.length())))
+      {
+         endPos = curPos + keyWord.length();
+      }
+      else
+      {
+         return false;
+      }
+
+      return keyWord.equalsIgnoreCase(sqlEditorText.substring(curPos, endPos));
+   }
+}

sql12/core/src/net/sourceforge/squirrel_sql/client/session/parser/kernel/StatementBeginPrediction.java

@@ -0,0 +1,24 @@
+package net.sourceforge.squirrel_sql.client.session.parser.kernel;
+
+public class UnionKeyWordCheck
+{
+   private boolean _inUnion;
+
+   public boolean previousWasUnionOrUnionAll()
+   {
+      return _inUnion ;
+   }
+
+   public void reset()
+   {
+      _inUnion = false;
+   }
+
+   public void check(String sqlEditorText, int beginPos)
+   {
+      if(false == _inUnion)
+      {
+         _inUnion = StatementBeginPredictionUtil.startsWithIgnoreCase(sqlEditorText, beginPos, "UNION");
+      }
+   }
+}