X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FBelongsTo.pm;h=8c8ceaa69cce9a165da25202d70d0a06ef42816a;hb=c037c03aa6089d35c8a62ce5e1ed8b19e765c8bc;hp=093d0be60aa1cf928f19ab89dba636d13b537656;hpb=35c2ee73e62f1b99d956a874f87d75230f9b07a9;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Relationship/BelongsTo.pm b/lib/DBIx/Class/Relationship/BelongsTo.pm
index 093d0be..8c8ceaa 100644
--- a/lib/DBIx/Class/Relationship/BelongsTo.pm
+++ b/lib/DBIx/Class/Relationship/BelongsTo.pm
@@ -5,28 +5,21 @@ 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
+  $class->ensure_class_loaded($f_class);
+  # no join condition or just a column name
   if (!ref $cond) {
-    $class->throw("Can't infer join condition for ${rel} on ${class}; unable to load ${f_class}")
-      unless $f_loaded;
+    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("Can't infer join condition for ${rel} on ${class}; ${f_class} has no primary keys")
-      unless defined $pri;      
-    $class->throw("Can't infer join condition for ${rel} on ${class}; ${f_class} has multiple primary key")
-      if $too_many;      
+    $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("Can't infer join condition for ${rel} on ${class}; $fk is not a column")
+    $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';
@@ -35,7 +28,7 @@ sub belongs_to {
       { accessor => $acc_type, %{$attrs || {}} }
     );
   }
-  # multiple key relationship
+  # explicit join condition
   elsif (ref $cond eq 'HASH') {
     my $cond_rel;
     for (keys %$cond) {
@@ -52,7 +45,7 @@ sub belongs_to {
     );
   }
   else {
-    $class->throw('third argument for belongs_to must be undef, a column name, or a join condition');
+    $class->throw_exception('third argument for belongs_to must be undef, a column name, or a join condition');
   }
   return 1;
 }