Bug fix: Improved the performance of SQL result tab header marking for large SQL editor content.

Author: gerdwagner

sql12/core/doc/changes.txt

@@ -86,6 +86,8 @@ Table cell data popup now offers find, Xml/Json-reformatting and export function
 
 Bug fixes:
 
+Improved the performance of SQL result tab header marking for large SQL editor content.
+
 SQL result tab header marks:
   The option "Compare SQLs disregarding comments, line feeds and other white spaces" did not work properly.
   The option can be found at menu File --> Global Preferences --> tab SQL --> section "SQL result tab header".

sql12/core/src/net/sourceforge/squirrel_sql/client/session/mainpanel/resulttabheader/ResultTabMatchingCurrentSqlHandler.java

@@ -85,7 +85,7 @@ private void onTextAreaPaint(boolean activateLastMarked)
          {
 
             IQueryTokenizer qt = _entryPanel.getSession().getNewQueryTokenizer();
-            qt.setScriptToTokenize(sqlToBeExecuted, QueryTokenizePurpose.OTHER);
+            qt.setScriptToTokenize(sqlToBeExecuted, QueryTokenizePurpose.FIRST_STATEMENT_ONLY);
 
             if(false == qt.hasQuery())
             {

sql12/core/src/net/sourceforge/squirrel_sql/fw/sql/querytokenizer/QueryTokenizePurpose.java

@@ -3,5 +3,5 @@
 public enum QueryTokenizePurpose
 {
    STATEMENT_EXECUTION,
-   OTHER
+   FIRST_STATEMENT_ONLY
 }

sql12/core/src/net/sourceforge/squirrel_sql/fw/sql/querytokenizer/QueryTokenizer.java

@@ -212,6 +212,12 @@ public void setScriptToTokenize(String script, QueryTokenizePurpose queryTokeniz
                 if(0 < newQuery.length())
                 {
                    _queries.add(new QueryHolder(curQuery.toString().trim(), curOriginalQuery.toString().trim()));
+
+                   if(QueryTokenizePurpose.FIRST_STATEMENT_ONLY == queryTokenizePurpose)
+                   {
+                      _queryIterator = _queries.iterator();
+                      return;
+                   }
                 }
              }
              curQuery.setLength(0);