firming up can_link()

[dbsrgits/SQL-Translator.git] / lib / SQL / Translator / Schema / Table.pm

diff --git a/lib/SQL/Translator/Schema/Table.pm b/lib/SQL/Translator/Schema/Table.pm
index fc29754..2163b9e 100644 (file)
--- a/lib/SQL/Translator/Schema/Table.pm
+++ b/lib/SQL/Translator/Schema/Table.pm
@@ -1,7 +1,7 @@
 package SQL::Translator::Schema::Table;
 
 # ----------------------------------------------------------------------
-# $Id: Table.pm,v 1.16 2003-08-29 08:00:51 allenday Exp $
+# $Id: Table.pm,v 1.17 2003-08-29 08:25:32 allenday Exp $
 # ----------------------------------------------------------------------
 # Copyright (C) 2003 Ken Y. Clark <kclark@cpan.org>
 #
@@ -51,7 +51,7 @@ use Data::Dumper;
 use base 'Class::Base';
 use vars qw( $VERSION $FIELD_ORDER );
 
-$VERSION = sprintf "%d.%02d", q$Revision: 1.16 $ =~ /(\d+)\.(\d+)/;
+$VERSION = sprintf "%d.%02d", q$Revision: 1.17 $ =~ /(\d+)\.(\d+)/;
 
 # ----------------------------------------------------------------------
 sub init {
@@ -460,46 +460,45 @@ Determine whether the table can link two arg tables via many-to-many.
   my %fk = ();
 
   foreach my $field ($self->get_fields){
-       #if the table has non-key fields, it can't be a link
-       if(!$field->is_primary_key and !$field->is_foreign_key){
-         $self->{'can_link'}{$table1->name}{$table2->name} = [0];
-         $self->{'can_link'}{$table2->name}{$table1->name} = [0];
-         return $self->{'can_link'}{$table1->name}{$table2->name};
-
-       #otherwise, count up how many fields refer to each FK table.field
-       } elsif($field->is_foreign_key){
-         push @{ $fk{$field->foreign_key_reference->reference_table->name} }, $field->foreign_key_reference;
+       if($field->is_foreign_key){
+         push @{ $fk{$field->foreign_key_reference->reference_table} }, $field->foreign_key_reference;
        }
   }
 
+  if(!defined($fk{ $table1->name }) or !defined($fk{ $table2->name })){
+       $self->{'can_link'}{$table1->name}{$table2->name} = [0];
+       $self->{'can_link'}{$table2->name}{$table1->name} = [0];
+       return $self->{'can_link'}{$table1->name}{$table2->name};
+  }
+
   #trivial traversal, only one way to link the two tables
-  if(scalar($fk{ $table1->name } == 1)
+  if(scalar(@{$fk{ $table1->name } } == 1)
         and
-        scalar($fk{ $table2->name } == 1)
+        scalar(@{$fk{ $table2->name } } == 1)
        ){
        $self->{'can_link'}{$table1->name}{$table2->name} = ['one2one', $fk{$table1->name}, $fk{$table2->name}];
        $self->{'can_link'}{$table1->name}{$table2->name} = ['one2one', $fk{$table2->name}, $fk{$table1->name}];
 
   #non-trivial traversal.  one way to link table2, many ways to link table1
-  } elsif(scalar($fk{ $table1->name }  > 1)
+  } elsif(scalar(@{ $fk{ $table1->name } }  > 1)
                  and
-                 scalar($fk{ $table2->name } == 1)
+                 scalar(@{ $fk{ $table2->name } } == 1)
                 ){
        $self->{'can_link'}{$table1->name}{$table2->name} = ['many2one', $fk{$table1->name}, $fk{$table2->name}];
        $self->{'can_link'}{$table2->name}{$table1->name} = ['one2many', $fk{$table2->name}, $fk{$table1->name}];
 
   #non-trivial traversal.  one way to link table1, many ways to link table2
-  } elsif(scalar($fk{ $table1->name } == 1)
+  } elsif(scalar(@{ $fk{ $table1->name } } == 1)
                  and
-                 scalar($fk{ $table2->name }  > 1)
+                 scalar(@{ $fk{ $table2->name } }  > 1)
                 ){
        $self->{'can_link'}{$table1->name}{$table2->name} = ['one2many', $fk{$table1->name}, $fk{$table2->name}];
        $self->{'can_link'}{$table2->name}{$table1->name} = ['many2one', $fk{$table2->name}, $fk{$table1->name}];
 
   #non-trivial traversal.  many ways to link table1 and table2
-  } elsif(scalar($fk{ $table1->name }  > 1)
+  } elsif(scalar(@{ $fk{ $table1->name } }  > 1)
                  and
-                 scalar($fk{ $table2->name }  > 1)
+                 scalar(@{ $fk{ $table2->name } }  > 1)
                 ){
        $self->{'can_link'}{$table1->name}{$table2->name} = ['many2many', $fk{$table1->name}, $fk{$table2->name}];
        $self->{'can_link'}{$table2->name}{$table1->name} = ['many2many', $fk{$table2->name}, $fk{$table1->name}];