X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FBelongsTo.pm;h=ef2506914fc6046c6a1d6667bbcab891a120b03e;hb=75a1c7540e2d258e1a7bcce7d123e51e409b3416;hp=7435d7b0d122edf818b1f5a1c01448660c225086;hpb=55de06f116aadb02326d4613a4db7117941e5350;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Relationship/BelongsTo.pm b/lib/DBIx/Class/Relationship/BelongsTo.pm
index 7435d7b..ef25069 100644
--- a/lib/DBIx/Class/Relationship/BelongsTo.pm
+++ b/lib/DBIx/Class/Relationship/BelongsTo.pm
@@ -7,25 +7,33 @@ sub belongs_to {
   my ($class, $rel, $f_class, $cond, $attrs) = @_;
   eval "require $f_class";
   if ($@) {
-    $class->throw($@) unless $@ =~ /Can't locate/;
+    $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 %f_primaries;
-  $f_primaries{$_} = 1 for eval { $f_class->primary_columns };
-  my $f_loaded = !$@;
-  # single key relationship
-  if (not defined $cond) {
-    $class->throw("Can't infer join condition for ${rel} on ${class}; unable to load ${f_class}") unless $f_loaded;
     my ($pri, $too_many) = keys %f_primaries;
-    $class->throw("Can't infer join condition for ${rel} on ${class}; ${f_class} has multiple primary key") if $too_many;
-    my $acc_type = ($class->has_column($rel)) ? 'filter' : 'single';
+    $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}" },
+      { "foreign.${pri}" => "self.${fk}" },
       { accessor => $acc_type, %{$attrs || {}} }
     );
   }
-  # multiple key relationship
-  else {
+  # explicit join condition
+  elsif (ref $cond eq 'HASH') {
     my $cond_rel;
     for (keys %$cond) {
       if (m/\./) { # Explicit join condition
@@ -34,11 +42,15 @@ sub belongs_to {
       }
       $cond_rel->{"foreign.$_"} = "self.".$cond->{$_};
     }
+    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;
 }