[Squirrel-sql-commits] SF.net SVN: squirrel-sql:[6475] trunk/sql12

[<ger...@us...>]

Revision: 6475
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6475&view=rev
Author:   gerdwagner
Date:     2011-11-06 21:46:57 +0000 (Sun, 06 Nov 2011)
Log Message:
-----------
Bug fix: Graph Plugin / Query Builder: Fixed adding Quotes behavior for IN/NOT IN where clause expressions.

Modified Paths:
--------------
    trunk/sql12/doc/src/main/resources/changes.txt
    trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryFilterController.java
    trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryFilterOperators.java

Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt	2011-11-06 21:06:22 UTC (rev 6474)
+++ trunk/sql12/doc/src/main/resources/changes.txt	2011-11-06 21:46:57 UTC (rev 6475)
@@ -129,6 +129,8 @@
 
 Bug-fixes:
 
+Graph Plugin / Query Builder: Fixed adding Quotes behavior for IN/NOT IN where clause expressions.
+
 3433001: Elapsed time for building output is incorrect.
 
 3183001: ClassCastException occurs, when the first tab should be closed after running a query.

Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryFilterController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryFilterController.java	2011-11-06 21:06:22 UTC (rev 6474)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryFilterController.java	2011-11-06 21:46:57 UTC (rev 6475)
@@ -177,7 +177,8 @@
    private void onOK()
    {
 
-      _columnInfo.getQueryData().setOperator((QueryFilterOperators) _queryFilterDlg._cboOperator.getSelectedItem());
+      QueryFilterOperators operator = (QueryFilterOperators)_queryFilterDlg._cboOperator.getSelectedItem();
+      _columnInfo.getQueryData().setOperator(operator);
 
       _columnInfo.getQueryData().setFilterValue(null);
       String text = _queryFilterDlg._txtFilter.getText();
@@ -185,7 +186,10 @@
       {
          ExtendedColumnInfo ec = getExtendedColumnInfo();
 
-         if (_queryFilterDlg._chkApplyQuotes.isSelected() && null != ec && ec.isCharacterType())
+         if (_queryFilterDlg._chkApplyQuotes.isSelected()
+             && null != ec
+             && ec.isCharacterType()
+             && operator.isSingleValued())
          {
             _columnInfo.getQueryData().setFilterValue(getQuotedText(text));
          }

Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryFilterOperators.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryFilterOperators.java	2011-11-06 21:06:22 UTC (rev 6474)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/querybuilder/QueryFilterOperators.java	2011-11-06 21:46:57 UTC (rev 6475)
@@ -62,4 +62,9 @@
    {
       return _toString;
    }
+
+   public boolean isSingleValued()
+   {
+      return  IN != this && NOT_IN != this;
+   }
 }

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.