Bug fix: 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".

Author: GWA

sql12/core/doc/changes.txt

@@ -79,6 +79,10 @@ Table cell data popup now offers find, Xml/Json-reformatting and export function
 
 Bug fixes:
 
+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".
+
 Fixed NullPointer in class NullValueColorHandler.
 
 https://github.com/squirrel-sql-client/squirrel-sql-code/issues/46

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

@@ -1,14 +1,15 @@
 package net.sourceforge.squirrel_sql.client.session.mainpanel.resulttabheader;
 
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.Map;
+
 import net.sourceforge.squirrel_sql.client.session.ISession;
 import net.sourceforge.squirrel_sql.client.session.mainpanel.IResultTab;
 import net.sourceforge.squirrel_sql.client.util.codereformat.CodeReformator;
 import net.sourceforge.squirrel_sql.client.util.codereformat.CodeReformatorConfigFactory;
 import net.sourceforge.squirrel_sql.fw.id.IntegerIdentifier;
-
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.Map;
+import net.sourceforge.squirrel_sql.fw.sql.commentandliteral.SQLCommentRemover;
 
 public class NormalizedSqlCompareCache
 {
@@ -26,20 +27,26 @@ public String getResultTabSqlNormalized(ISession session, IResultTab sqlResultTa
 
       if(null == resultTabEntry)
       {
-         resultTabEntry = new NormalizedSqlCompareCacheEntry(getReformator(session).getNormalizedSql(sqlResultTab.getSqlString()), ++_resultTabCounter);
+         resultTabEntry = new NormalizedSqlCompareCacheEntry(normalizeAndRemoveComments(session, sqlResultTab.getOriginalSqlString()), ++_resultTabCounter);
          _resultTabIdToEntry.put(sqlResultTab.getIdentifier(), resultTabEntry);
       }
 
       return resultTabEntry.getNormalizedSql();
    }
 
+   private String normalizeAndRemoveComments(ISession session, String sql)
+   {
+      sql = SQLCommentRemover.removeComments(sql);
+      return getReformator(session).getNormalizedSql(sql);
+   }
+
    public String getEditorSqlNormalized(ISession session, String editorSql)
    {
       NormalizedSqlCompareCacheEntry editorEntry = _editorSqlToEntry.get(editorSql);
 
       if(null == editorEntry)
       {
-         editorEntry = new NormalizedSqlCompareCacheEntry(getReformator(session).getNormalizedSql(editorSql), ++_editorSqlCounter);
+         editorEntry = new NormalizedSqlCompareCacheEntry(normalizeAndRemoveComments(session, editorSql), ++_editorSqlCounter);
          _editorSqlToEntry.put(editorSql, editorEntry);
       }
       return editorEntry.getNormalizedSql();

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

@@ -1,5 +1,12 @@
 package net.sourceforge.squirrel_sql.client.session.mainpanel.resulttabheader;
 
+import java.util.ArrayList;
+import java.util.Collections;
+import java.util.Comparator;
+import java.util.List;
+import javax.swing.JTabbedPane;
+import javax.swing.Timer;
+
 import net.sourceforge.squirrel_sql.client.Main;
 import net.sourceforge.squirrel_sql.client.session.ISQLEntryPanel;
 import net.sourceforge.squirrel_sql.client.session.editorpaint.TextAreaPaintListener;
@@ -9,13 +16,6 @@
 import net.sourceforge.squirrel_sql.fw.sql.querytokenizer.IQueryTokenizer;
 import org.apache.commons.lang3.StringUtils;
 
-import javax.swing.JTabbedPane;
-import javax.swing.Timer;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-
 public class ResultTabMatchingCurrentSqlHandler
 {
    private boolean _resultTabHeaderMarkingActive;
@@ -93,7 +93,7 @@ private void onTextAreaPaint(boolean activateLastMarked)
             else
             {
                String resultTabSqlNormalized = _normalizedSqlCompareCache.getResultTabSqlNormalized(_entryPanel.getSession(), sqlResultTab);
-               String sqlToBeExecutedNormalized = _normalizedSqlCompareCache.getEditorSqlNormalized(_entryPanel.getSession(), qt.nextQuery().getCleanQuery());
+               String sqlToBeExecutedNormalized = _normalizedSqlCompareCache.getEditorSqlNormalized(_entryPanel.getSession(), qt.nextQuery().getOriginalQuery());
 
                tabMatchesSqlToBeExecuted = StringUtils.equalsIgnoreCase(resultTabSqlNormalized, sqlToBeExecutedNormalized);
             }

sql12/core/src/net/sourceforge/squirrel_sql/fw/sql/commentandliteral/SQLCommentRemover.java

@@ -1,10 +1,20 @@
 package net.sourceforge.squirrel_sql.fw.sql.commentandliteral;
 
+import net.sourceforge.squirrel_sql.client.Main;
+import net.sourceforge.squirrel_sql.fw.util.StringUtilities;
+
 public class SQLCommentRemover
 {
    public static String removeComments(String sql)
    {
-      final SQLCommentAndLiteralHandler commentAndLiteralHandler = new SQLCommentAndLiteralHandler(sql, "--", true, true);
+      String lineCommentBegin = "--";
+
+      if(StringUtilities.isNotEmpty(Main.getApplication().getSquirrelPreferences().getSessionProperties().getStartOfLineComment(), true))
+      {
+         lineCommentBegin = Main.getApplication().getSquirrelPreferences().getSessionProperties().getStartOfLineComment();
+      }
+
+      final SQLCommentAndLiteralHandler commentAndLiteralHandler = new SQLCommentAndLiteralHandler(sql, lineCommentBegin, true, true);
 
       StringBuilder ret = new StringBuilder();
       for (int i = 0; i < sql.length(); ++i)