Merged patched from andyg to throw useful errors during relationship loading

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Relationship / BelongsTo.pm

diff --git a/lib/DBIx/Class/Relationship/BelongsTo.pm b/lib/DBIx/Class/Relationship/BelongsTo.pm
index 4201835..7435d7b 100644 (file)
--- a/lib/DBIx/Class/Relationship/BelongsTo.pm
+++ b/lib/DBIx/Class/Relationship/BelongsTo.pm
@@ -6,19 +6,26 @@ use warnings;
 sub belongs_to {
   my ($class, $rel, $f_class, $cond, $attrs) = @_;
   eval "require $f_class";
+  if ($@) {
+    $class->throw($@) unless $@ =~ /Can't locate/;
+  }
+
+  my %f_primaries;
+  $f_primaries{$_} = 1 for eval { $f_class->primary_columns };
+  my $f_loaded = !$@;
   # single key relationship
   if (not defined $cond) {
-    my ($pri, $too_many) = keys %{ $f_class->_primaries };
-    my $acc_type = ($class->_columns->{$rel}) ? 'filter' : 'single';
+    $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->add_relationship($rel, $f_class,
       { "foreign.${pri}" => "self.${rel}" },
-      { accessor => $acc_type }
+      { accessor => $acc_type, %{$attrs || {}} }
     );
   }
   # multiple key relationship
   else {
-    my %f_primaries = eval { %{ $f_class->_primaries } };
-    my $f_loaded = !$@;
     my $cond_rel;
     for (keys %$cond) {
       if (m/\./) { # Explicit join condition
@@ -26,17 +33,10 @@ 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;
     $class->add_relationship($rel, $f_class,
       $cond_rel,
-      { accessor => 'single', %{$attrs ||{}} }
+      { accessor => 'single', %{$attrs || {}} }
     );
   }
   return 1;