Thread: [Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5997] trunk/sql12/plugins/graph/src/main

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Revision: 5997
          http://squirrel-sql.svn.sourceforge.net/squirrel-sql/?rev=5997&view=rev
Author:   gerdwagner
Date:     2010-11-22 18:30:29 +0000 (Mon, 22 Nov 2010)

Log Message:
-----------
raph Plugin: Multiple tables can now be selected and moved simultanously

Modified Paths:
--------------
    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/FoldingPoint.java
    trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java
    trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopPane.java
    trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableFrame.java
    trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties

Added Paths:
-----------
    trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopManager.java
    trunk/sql12/plugins/graph/src/main/resources/doc/best_mysql-5.1-linux.sql

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	2010-11-22 01:03:00 UTC (rev 5996)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/ConstraintView.java	2010-11-22 18:30:29 UTC (rev 5997)
@@ -761,4 +761,14 @@
    {
       return _constraintData.hasOverlap(other._constraintData);
    }
+
+   public Vector<FoldingPoint> getFoldingPoints()
+   {
+      return _constraintGraph.getFoldingPoints();
+   }
+
+   public boolean isAttachedTo(TableFrame tableFrame)
+   {
+      return tableFrame == _pkFramePointingTo.getFrame() || tableFrame == _fkFrameOriginatingFrom.getFrame();
+   }
 }

Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/FoldingPoint.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/FoldingPoint.java	2010-11-22 01:03:00 UTC (rev 5996)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/FoldingPoint.java	2010-11-22 18:30:29 UTC (rev 5997)
@@ -36,8 +36,8 @@
       if(_zoomer.isEnabled())
       {
          double zoom = _zoomer.getZoom();
-         _zoomedPointBuffer.x = (int)(_unzoomedPoint.x*zoom+0.5);
-         _zoomedPointBuffer.y = (int)(_unzoomedPoint.y*zoom+0.5);
+         _zoomedPointBuffer.x = (int)( ((double)_unzoomedPoint.x) * zoom  + 0.5);
+         _zoomedPointBuffer.y = (int)( ((double)_unzoomedPoint.y) * zoom  + 0.5);
 
       }
       else
@@ -63,4 +63,11 @@
    {
       return _unzoomedPoint;
    }
+
+   public void moveBy(Point delta)
+   {
+      double zoom = _zoomer.getZoom();
+      _unzoomedPoint.x += (int)(    ((double)delta.x) / zoom   + Math.signum(delta.x) * 0.5);
+      _unzoomedPoint.y += (int)(    ((double)delta.y) / zoom   + Math.signum(delta.y) * 0.5);
+   }
 }

Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java	2010-11-22 01:03:00 UTC (rev 5996)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopController.java	2010-11-22 18:30:29 UTC (rev 5997)
@@ -44,6 +44,8 @@
    private JMenuItem _mnuRemoveGraph;
    private JMenuItem _mnuRefreshAllTables;
    private JMenuItem _mnuScriptAllTables;
+   private JMenuItem _mnuSelectAllTables;
+   private JMenuItem _mnuSelectTablesByName;
    private JCheckBoxMenuItem _mnuShowConstraintNames;
    private JCheckBoxMenuItem _mnuZoomPrint;
    private JCheckBoxMenuItem _mnuShowQualifiedTableNames;
@@ -186,6 +188,29 @@
          }
       });
 
+      /////////////////////////////////////////////////////////
+      // Tablegroups
+		// i18n[graph.scriptAllTables=Script all tables]
+		_mnuSelectAllTables = new JMenuItem(s_stringMgr.getString("graph.selectAllTables"));
+		_mnuSelectAllTables.addActionListener(new ActionListener()
+	    {
+	       public void actionPerformed(ActionEvent e)
+	       {
+	          onSelectAllTables();
+	       }
+	    });
+
+	// i18n[graph.scriptAllTables=Script all tables]
+	_mnuSelectTablesByName = new JMenuItem(s_stringMgr.getString("graph.selectTablesByName"));
+	_mnuSelectTablesByName.addActionListener(new ActionListener()
+	  {
+	     public void actionPerformed(ActionEvent e)
+	     {
+	        onSelectTablesByName();
+	     }
+	  });
+	  /////////////////////////////////////////////////////////
+
 		// i18n[graph.showConstr=Show constraint names]
 		_mnuShowConstraintNames = new JCheckBoxMenuItem(s_stringMgr.getString("graph.showConstr"));
       _mnuShowConstraintNames.addActionListener(new ActionListener()
@@ -250,6 +275,12 @@
       _popUp.add(_mnuRefreshAllTables);
       _popUp.add(_mnuScriptAllTables);
       _popUp.add(new JSeparator());
+      /////////////////////////////////////////////////////////
+      // Tablegroups
+      _popUp.add(_mnuSelectAllTables);
+      _popUp.add(_mnuSelectTablesByName);
+      _popUp.add(new JSeparator());
+      /////////////////////////////////////////////////////////
       _popUp.add(_mnuAllTablesDbOrder);
       _popUp.add(_mnuAllTablesByNameOrder);
       _popUp.add(_mnuAllTablesPkConstOrder);
@@ -285,6 +316,33 @@
       _listener.scriptAllTablesRequested();
    }
 
+   /////////////////////////////////////////////////////////
+   // Tablegroups
+   private void onSelectAllTables()
+   {
+      for(JInternalFrame f:_desktopPane.getAllFrames()) {
+    	  if(f instanceof TableFrame) {
+    		  _desktopPane.addGroupFrame((TableFrame)f);
+    	  }
+      }
+   }
+
+   private void onSelectTablesByName()
+   {
+      String namePattern=JOptionPane.showInputDialog(_desktopPane, s_stringMgr.getString("graph.selectTablesByName.message"), s_stringMgr.getString("graph.selectTablesByName.title"), JOptionPane.QUESTION_MESSAGE);
+      
+      _desktopPane.clearGroupFrames();
+      for(JInternalFrame f:_desktopPane.getAllFrames()) {
+    	  if(f instanceof TableFrame) {
+    		  TableFrame tf=(TableFrame)f;
+	    	  if(tf.getTitle().matches(namePattern.replace('?', '.').replace("*", ".*"))) {
+	    		  _desktopPane.addGroupFrame(tf);
+	    	  }
+    	  }
+      }
+   }
+   /////////////////////////////////////////////////////////
+
    private void onRefreshAllTables()
    {
       _listener.refreshAllTablesRequested();

Added: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopManager.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopManager.java	                        (rev 0)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopManager.java	2010-11-22 18:30:29 UTC (rev 5997)
@@ -0,0 +1,138 @@
+package net.sourceforge.squirrel_sql.plugins.graph;
+
+import java.awt.*;
+import java.util.*;
+import java.util.List;
+
+import javax.swing.DefaultDesktopManager;
+import javax.swing.JComponent;
+import javax.swing.JInternalFrame;
+
+public class GraphDesktopManager extends DefaultDesktopManager
+{
+   private GraphDesktopPane _graphDesktopPane;
+   private HashSet<FoldingPoint> _uniqueFoldingPointsBuffer = new HashSet<FoldingPoint>();
+
+   public GraphDesktopManager(GraphDesktopPane graphDesktopPane)
+   {
+      _graphDesktopPane = graphDesktopPane;
+   }
+
+   @Override
+   public void dragFrame(JComponent f, int newX, int newY)
+   {
+      int correctX = newX;
+      int correctY = newY;
+      if (f instanceof TableFrame)
+      {
+         TableFrame tf = (TableFrame) f;
+
+         if (!_graphDesktopPane.isGroupFrame(tf))
+         {
+            _graphDesktopPane.setGroupFrame(tf);
+         }
+
+         Point correctDelta = checkBounds(newX - f.getX(), newY - f.getY(), _graphDesktopPane);
+         correctX = f.getX() + correctDelta.x;
+         correctY = f.getY() + correctDelta.y;
+         for (TableFrame current : _graphDesktopPane.getGroupFrames())
+         {
+            if (current != tf)
+            {
+               Point newLocation = new Point(current.getX() + correctDelta.x, current.getY() + correctDelta.y);
+               current.setLocation(newLocation);
+            }
+         }
+         moveFoldingPoints(_graphDesktopPane.getGroupFrames(), correctDelta);
+      }
+      super.dragFrame(f, correctX, correctY);
+
+      _graphDesktopPane.repaint(); // Needed in case tbles are moved that don't have any constraints.
+   }
+
+   private void moveFoldingPoints(List<TableFrame> movedTableFrames, Point delta)
+   {
+      for (TableFrame f1 : movedTableFrames)
+      {
+         for (TableFrame f2 : movedTableFrames)
+         {
+            if(f1 != f2)
+            {
+               fillFoldingPointsBetween(_uniqueFoldingPointsBuffer, f1, f2);
+            }
+         }
+      }
+
+      for (FoldingPoint fp : _uniqueFoldingPointsBuffer)
+      {
+         fp.moveBy(delta);
+      }
+      _uniqueFoldingPointsBuffer.clear();
+   }
+
+   private void fillFoldingPointsBetween(HashSet<FoldingPoint> toFill, TableFrame f1, TableFrame f2)
+   {
+      Vector<GraphComponent> graphComponents = _graphDesktopPane.getGraphComponents();
+
+      for (GraphComponent graphComponent : graphComponents)
+      {
+         if(graphComponent instanceof ConstraintView)
+         {
+            ConstraintView cv = (ConstraintView) graphComponent;
+
+            if(0 < cv.getFoldingPoints().size() && cv.isAttachedTo(f1) && cv.isAttachedTo(f2))
+            {
+               Vector<FoldingPoint> pointVector = cv.getFoldingPoints();
+
+               for (FoldingPoint foldingPoint : pointVector)
+               {
+                  toFill.add(foldingPoint);
+               }
+            }
+         }
+      }
+   }
+
+   @Override
+   public void resizeFrame(JComponent f, int newX, int newY, int newWidth, int newHeight)
+   {
+      if (f instanceof TableFrame)
+      {
+         TableFrame tf = (TableFrame) f;
+
+         if (!_graphDesktopPane.isGroupFrame(tf))
+         {
+            _graphDesktopPane.setGroupFrame(tf);
+         }
+
+         Point delta = new Point(newX - f.getX(), newY - f.getY());
+         for (JInternalFrame current : _graphDesktopPane.getGroupFrames())
+         {
+            if (current != f)
+            {
+               current.setBounds(current.getX() + delta.x, current.getY() + delta.y, newWidth, newHeight);
+            }
+         }
+      }
+
+      super.resizeFrame(f, newX, newY, newWidth, newHeight);
+   }
+
+   private Point checkBounds(int deltaX, int deltaY, GraphDesktopPane desktopPane)
+   {
+      Point rc = new Point(deltaX, deltaY);
+      for (TableFrame current : desktopPane.getGroupFrames())
+      {
+         Point newLocation = new Point(current.getX() + deltaX, current.getY() + deltaY);
+         if (newLocation.x < 0 && rc.x < -current.getX())
+         {
+            rc.x = -current.getX();
+         }
+         if (newLocation.y < 0 && rc.y < -current.getY())
+         {
+            rc.y = -current.getY();
+         }
+      }
+      return rc;
+   }
+}

Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopPane.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopPane.java	2010-11-22 01:03:00 UTC (rev 5996)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/GraphDesktopPane.java	2010-11-22 18:30:29 UTC (rev 5997)
@@ -1,18 +1,28 @@
 package net.sourceforge.squirrel_sql.plugins.graph;
 
-import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.ScrollableDesktopPane;
-import net.sourceforge.squirrel_sql.client.IApplication;
-
-import javax.swing.*;
-import java.awt.*;
+import java.awt.Dimension;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.Toolkit;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
 import java.awt.geom.AffineTransform;
+import java.awt.print.PageFormat;
 import java.awt.print.Printable;
-import java.awt.print.PageFormat;
 import java.awt.print.PrinterException;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Set;
 import java.util.Vector;
-import java.util.Arrays;
 
+import javax.swing.RepaintManager;
 
+import net.sourceforge.squirrel_sql.client.IApplication;
+import net.sourceforge.squirrel_sql.client.gui.desktopcontainer.ScrollableDesktopPane;
+
+
 public class GraphDesktopPane extends ScrollableDesktopPane implements GraphPrintable
 {
    private static final long serialVersionUID = 1L;
@@ -20,6 +30,11 @@
    private transient ConstraintViewListener _constraintViewListener;
 
    /////////////////////////////////////////////////////////
+   // Tablegroups
+   private transient Set<TableFrame> _groupFrames = new HashSet<TableFrame>();
+   /////////////////////////////////////////////////////////
+
+   /////////////////////////////////////////////////////////
    // Printing
    private double _formatWidthInPixel;
    private double _formatHeightInPixel;
@@ -38,9 +53,73 @@
             revalidate();
          }
       };
+      
+      /////////////////////////////////////////////////////////
+      // Tablegroups
+      this.setDesktopManager(new GraphDesktopManager(this));
+      this.addMouseListener(new MouseAdapter() {
+
+         @Override
+         public void mouseClicked(MouseEvent e)
+         {
+            clearGroupFrames();
+         }
+
+      });
+      /////////////////////////////////////////////////////////
    }
 
 
+
+   /////////////////////////////////////////////////////////
+   // Tablegroups
+   public void setGroupFrame(TableFrame f)
+   {
+      List<TableFrame> temp = new ArrayList<TableFrame>(this._groupFrames);
+      this._groupFrames.clear();
+      for (TableFrame current : temp)
+      {
+         current.repaint();
+      }
+      this._groupFrames.add(f);
+      f.repaint();
+   }
+
+   public void addGroupFrame(TableFrame f)
+   {
+      this._groupFrames.add(f);
+      f.repaint();
+   }
+
+   public void removeGroupFrame(TableFrame f)
+   {
+      this._groupFrames.remove(f);
+      f.repaint();
+   }
+
+   public void clearGroupFrames()
+   {
+      List<TableFrame> temp = new ArrayList<TableFrame>(GraphDesktopPane.this._groupFrames);
+      GraphDesktopPane.this._groupFrames.clear();
+      for (TableFrame current : temp)
+      {
+         current.repaint();
+      }
+   }
+
+   public List<TableFrame> getGroupFrames()
+   {
+      return new ArrayList<TableFrame>(this._groupFrames);
+   }
+
+   public boolean isGroupFrame(TableFrame f)
+   {
+      return this._groupFrames.contains(f);
+   }
+   /////////////////////////////////////////////////////////
+
+	
+	
    public void paint(Graphics g)
    {
       super.paintComponent(g);

Modified: trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableFrame.java
===================================================================
--- trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableFrame.java	2010-11-22 01:03:00 UTC (rev 5996)
+++ trunk/sql12/plugins/graph/src/main/java/net/sourceforge/squirrel_sql/plugins/graph/TableFrame.java	2010-11-22 18:30:29 UTC (rev 5997)
@@ -1,20 +1,32 @@
 package net.sourceforge.squirrel_sql.plugins.graph;
 
-import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.TableFrameXmlBean;
-import net.sourceforge.squirrel_sql.client.session.ISession;
+import java.awt.Color;
+import java.awt.Container;
+import java.awt.Dimension;
+import java.awt.Font;
+import java.awt.FontMetrics;
+import java.awt.Graphics;
+import java.awt.Graphics2D;
+import java.awt.LayoutManager;
+import java.awt.Rectangle;
+import java.awt.event.MouseAdapter;
+import java.awt.event.MouseEvent;
+import java.awt.geom.AffineTransform;
+import java.net.URL;
 
-import javax.swing.*;
+import javax.swing.ImageIcon;
+import javax.swing.JComponent;
+import javax.swing.JInternalFrame;
+import javax.swing.JMenuBar;
+import javax.swing.JScrollPane;
 import javax.swing.border.LineBorder;
 import javax.swing.plaf.basic.BasicInternalFrameTitlePane;
 import javax.swing.plaf.basic.BasicInternalFrameUI;
-import javax.imageio.ImageReader;
-import javax.imageio.stream.ImageInputStream;
-import javax.imageio.stream.ImageInputStreamImpl;
-import java.awt.*;
-import java.awt.geom.AffineTransform;
-import java.net.URL;
 
+import net.sourceforge.squirrel_sql.client.session.ISession;
+import net.sourceforge.squirrel_sql.plugins.graph.xmlbeans.TableFrameXmlBean;
 
+
 public class TableFrame extends JInternalFrame
 {
    GraphTextAreaFactory txtColumsFactory;
@@ -79,8 +91,7 @@
          {
          }
       };
-
-
+      
       setBorder(new LineBorder(Color.BLACK));
    }
 
@@ -131,10 +142,10 @@
       return ret;
 
    }
-
+   
    class MyUI extends BasicInternalFrameUI
    {
-      public MyUI(JInternalFrame frame)
+	   public MyUI(JInternalFrame frame)
       {
          super(frame);
       }
@@ -157,18 +168,59 @@
    class MyTitlePaneUI extends BasicInternalFrameTitlePane
    {
       public static final int UNZOOMED_PREF_HEIGHT = 18;
+      private Color groupTitleColor;
 
+
       public MyTitlePaneUI(JInternalFrame f)
       {
          super(f);
+         /////////////////////////////////////////////////////////
+         // Tablegroups
+         this.addMouseListener(new MouseAdapter()
+         {
+            @Override
+            public void mouseClicked(MouseEvent e)
+            {
+               onMouseClickedTitlePane(e);
+            }
+         });
+         /////////////////////////////////////////////////////////
+
+
       }
 
+      private void onMouseClickedTitlePane(MouseEvent e)
+      {
+         if (e.getButton() == MouseEvent.BUTTON1)
+         {
+            GraphDesktopPane desktopPane = (GraphDesktopPane) TableFrame.this.getDesktopPane();
+            if (e.isControlDown())
+            {
+               if (desktopPane.isGroupFrame(TableFrame.this))
+               {
+                  desktopPane.removeGroupFrame(TableFrame.this);
+               }
+               else
+               {
+                  desktopPane.addGroupFrame(TableFrame.this);
+               }
+            }
+            else
+            {
+               desktopPane.setGroupFrame(TableFrame.this);
+            }
+         }
+      }
 
+
       protected void installDefaults()
       {
          super.installDefaults();
          URL resource = TableFrame.class.getResource("/net/sourceforge/squirrel_sql/plugins/graph/images/win_bigclose-rollover.gif");
          closeIcon = new ImageIcon(resource);
+         groupTitleColor = new Color(200,200,240);
+         selectedTitleColor = new Color(255,255,220);
+         notSelectedTitleColor = new Color(255,255,220);
          selectedTextColor = Color.black;
          notSelectedTextColor = Color.black;
          setFont(new Font(getFont().getFontName(), Font.BOLD, getFont().getSize()));
@@ -176,7 +228,14 @@
 
       protected void paintTitleBackground(Graphics g)
       {
-         g.setColor(new Color(255,255,220));
+         if (((GraphDesktopPane) frame.getDesktopPane()).isGroupFrame(TableFrame.this))
+         {
+            g.setColor(groupTitleColor);
+         }
+         else
+         {
+            g.setColor(notSelectedTitleColor);
+         }
          g.fillRect(0, 0, getWidth(), getHeight());
       }
 
@@ -283,6 +342,8 @@
             return ret;
          }
       }
+      
+      
 
    }
 }

Added: trunk/sql12/plugins/graph/src/main/resources/doc/best_mysql-5.1-linux.sql
===================================================================
--- trunk/sql12/plugins/graph/src/main/resources/doc/best_mysql-5.1-linux.sql	                        (rev 0)
+++ trunk/sql12/plugins/graph/src/main/resources/doc/best_mysql-5.1-linux.sql	2010-11-22 18:30:29 UTC (rev 5997)
@@ -0,0 +1,85 @@
+
+-- script which creates the schema that this documentation is based upon.
+
+create table best
+(
+bestid integer not null primary key,
+bestname varchar(250)
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+create table bestpos
+(
+bestid integer not null,
+bestposid integer not null primary key,
+bestposname varchar(250)
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+create table bestposart
+(
+bestposid integer not null,
+bestposartid integer not null primary key,
+bestposartname varchar(250)
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+create table best_lagpl
+(
+bestid integer not null,
+lagplid integer not null
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+alter table best_lagpl add constraint best_lagpl_pk primary key (bestid,lagplid);
+
+
+
+create table lagpl
+(
+lagplid integer not null primary key,
+lagplname varchar(250)
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+alter table bestpos
+add constraint fk_bestpos_best
+foreign key (bestid)
+references best (bestid);
+
+alter table bestposart
+add constraint fk_bestposart_bestpos
+foreign key (bestposid)
+references bestpos (bestposid);
+
+
+alter table best_lagpl
+add constraint fk_bestlagpl_best
+foreign key (bestid)
+references best (bestid);
+
+alter table best_lagpl
+add constraint fk_bestlagpl_lagpl
+foreign key (lagplid)
+references lagpl (lagplid);
+
+
+
+create table gwaparent
+(
+parentid1 integer not null,
+parentid2 integer not null,
+parenttext varchar(20)
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+alter table gwaparent add constraint gwaparent_pk primary key (parentid1,parentid2);
+
+
+create table gwachild
+(
+childid integer not null primary key,
+parentid1 integer not null,
+parentid2 integer not null,
+childtext varchar(20)
+)ENGINE=InnoDB DEFAULT CHARSET=utf8;
+
+alter table gwachild
+add constraint fk_gwachild_gwaparent
+foreign key (parentid1,parentid2)
+references gwaparent (parentid1,parentid2);
+

Modified: trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties
===================================================================
--- trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties	2010-11-22 01:03:00 UTC (rev 5996)
+++ trunk/sql12/plugins/graph/src/main/resources/net/sourceforge/squirrel_sql/plugins/graph/I18NStrings.properties	2010-11-22 18:30:29 UTC (rev 5997)
@@ -1,4 +1,7 @@
-
+graph.selectAllTables=Select all tables
+graph.selectTablesByName=Select tables by name
+graph.selectTablesByName.message=Name pattern (Wildcards: ?-single char / *-multiple chars):
+graph.selectTablesByName.title=Select tables by name
 #
 #Missing/changed properties generated by I18n Plugin on Mon Oct 17 22:10:30 CEST 2005
 #
@@ -124,4 +127,4 @@
 
 graph.ConfigureNonDbConstraintDlg.NonDbConstraintHint=Note: For most RDBMSes you will only be able to create this constraint in the DB if the constraint references all (and only) PK colums.
 
-graph.showThisConstraintName=show this constraint name
\ No newline at end of file
+graph.showThisConstraintName=show this constraint name


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




Thread: [Squirrel-sql-commits] SF.net SVN: squirrel-sql:[5997] trunk/sql12/plugins/graph/src/main

A Java SQL client for any JDBC compliant database

squirrel-sql-commits