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

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

Revision: 6611
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=6611&view=rev
Author:   gerdwagner
Date:     2012-04-07 22:58:12 +0000 (Sat, 07 Apr 2012)
Log Message:
-----------
When a table was removed from a query builder graph join types of remaining joins were reset to the default inner join type.

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

Modified: trunk/sql12/doc/src/main/resources/changes.txt
===================================================================
--- trunk/sql12/doc/src/main/resources/changes.txt	2012-04-07 15:50:57 UTC (rev 6610)
+++ trunk/sql12/doc/src/main/resources/changes.txt	2012-04-07 22:58:12 UTC (rev 6611)
@@ -64,6 +64,8 @@
 
 Bug fixes:
 
+When a table was removed from a query builder graph join types of remaining joins were reset to the default inner join type.
+
 Referesh (F5) didn't work right and didn't delete schema cache files when schema caching was used.
 
 Fixed memory leak: Sessions didn't get garbage collected as soon as a popup (code completion, bookmarks, tools popup) was used.

Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConstraintData.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConstraintData.java	2012-04-07 15:50:57 UTC (rev 6610)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConstraintData.java	2012-04-07 22:58:12 UTC (rev 6611)
@@ -290,4 +290,9 @@
          _fkCols.set(i, tableFramesModel.findColumn(_fkTableName, _fkCols.get(i).getColumnName()));
       }
    }
+
+   public void setConstraintQueryData(ConstraintQueryData constraintQueryData)
+   {
+      _constraintQueryData = constraintQueryData;
+   }
 }

Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConstraintView.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConstraintView.java	2012-04-07 15:50:57 UTC (rev 6610)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConstraintView.java	2012-04-07 22:58:12 UTC (rev 6611)
@@ -829,6 +829,7 @@
 
    public void setData(ConstraintData constraintData)
    {
+      constraintData.setConstraintQueryData(_constraintData.getConstraintQueryData());
       _constraintData = constraintData;
    }
 

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