X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FBelongsTo.pm;h=ef2506914fc6046c6a1d6667bbcab891a120b03e;hb=bf5ecff9ac30e6acfd912ce3c72ee86b73b775dc;hp=4201835a5747ff5b50aa5d1d9271e3534288be73;hpb=99be059e6d635374f075f430af6e7cd6ee18ab67;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Relationship/BelongsTo.pm b/lib/DBIx/Class/Relationship/BelongsTo.pm
index 4201835..ef25069 100644
--- a/lib/DBIx/Class/Relationship/BelongsTo.pm
+++ b/lib/DBIx/Class/Relationship/BelongsTo.pm
@@ -6,19 +6,34 @@ use warnings;
 sub belongs_to {
   my ($class, $rel, $f_class, $cond, $attrs) = @_;
   eval "require $f_class";
-  # single key relationship
-  if (not defined $cond) {
-    my ($pri, $too_many) = keys %{ $f_class->_primaries };
-    my $acc_type = ($class->_columns->{$rel}) ? 'filter' : 'single';
+  if ($@) {
+    $class->throw_exception($@) unless $@ =~ /Can't locate/;
+  }
+  
+  # no join condition or just a column name
+  if (!ref $cond) {
+    my %f_primaries = map { $_ => 1 } eval { $f_class->primary_columns };
+    $class->throw_exception("Can't infer join condition for ${rel} on ${class}; unable to load ${f_class}")
+      if $@;
+
+    my ($pri, $too_many) = keys %f_primaries;
+    $class->throw_exception("Can't infer join condition for ${rel} on ${class}; ${f_class} has no primary keys")
+      unless defined $pri;      
+    $class->throw_exception("Can't infer join condition for ${rel} on ${class}; ${f_class} has multiple primary keys")
+      if $too_many;      
+
+    my $fk = defined $cond ? $cond : $rel;
+    $class->throw_exception("Can't infer join condition for ${rel} on ${class}; $fk is not a column")
+      unless $class->has_column($fk);
+
+    my $acc_type = $class->has_column($rel) ? 'filter' : 'single';
     $class->add_relationship($rel, $f_class,
-      { "foreign.${pri}" => "self.${rel}" },
-      { accessor => $acc_type }
+      { "foreign.${pri}" => "self.${fk}" },
+      { accessor => $acc_type, %{$attrs || {}} }
     );
   }
-  # multiple key relationship
-  else {
-    my %f_primaries = eval { %{ $f_class->_primaries } };
-    my $f_loaded = !$@;
+  # explicit join condition
+  elsif (ref $cond eq 'HASH') {
     my $cond_rel;
     for (keys %$cond) {
       if (m/\./) { # Explicit join condition
@@ -26,19 +41,16 @@ sub belongs_to {
         last;
       }
       $cond_rel->{"foreign.$_"} = "self.".$cond->{$_};
-      # primary key usage checks
-      if (exists $f_primaries{$_}) {
-        delete $f_primaries{$_};
-      } elsif ($f_loaded) {
-        $class->throw("non primary key used in join condition: $_");
-      }
     }
-    $class->throw("not all primary keys used in multi key relationship!") if $f_loaded && keys %f_primaries;
+    my $acc_type = (keys %$cond_rel == 1 and $class->has_column($rel)) ? 'filter' : 'single';
     $class->add_relationship($rel, $f_class,
       $cond_rel,
-      { accessor => 'single', %{$attrs ||{}} }
+      { accessor => $acc_type, %{$attrs || {}} }
     );
   }
+  else {
+    $class->throw_exception('third argument for belongs_to must be undef, a column name, or a join condition');
+  }
   return 1;
 }