X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FHasMany.pm;h=7690af895c4dd3f56abe955f1dd30802f9cf1665;hb=6b2fbbf0102269df6dac9178697467eb5d3dd8e6;hp=e43e9bc597e81da6fc316a4357f63cdeb58c7c83;hpb=c0e7b4e55952cd193b6f1866d0c27ece182397eb;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Relationship/HasMany.pm b/lib/DBIx/Class/Relationship/HasMany.pm
index e43e9bc..7690af8 100644
--- a/lib/DBIx/Class/Relationship/HasMany.pm
+++ b/lib/DBIx/Class/Relationship/HasMany.pm
@@ -1,21 +1,33 @@
-package # hide from PAUSE 
+package # hide from PAUSE
     DBIx::Class::Relationship::HasMany;
 
 use strict;
 use warnings;
 
+our %_pod_inherit_config = 
+  (
+   class_map => { 'DBIx::Class::Relationship::HasMany' => 'DBIx::Class::Relationship' }
+  );
+
 sub has_many {
   my ($class, $rel, $f_class, $cond, $attrs) = @_;
-    
-  eval "require $f_class";
-  if ($@) {
-    $class->throw_exception($@) unless $@ =~ /Can't locate/;
-  }
 
   unless (ref $cond) {
-    my ($pri, $too_many) = $class->primary_columns;
-    $class->throw_exception( "has_many can only infer join for a single primary key; ${class} has more" )
-      if $too_many;
+    $class->ensure_class_loaded($f_class);
+    my ($pri, $too_many) = eval { $class->_pri_cols };
+    $class->throw_exception(
+      "Can't infer join condition for ${rel} on ${class}: $@"
+    ) if $@;
+
+    $class->throw_exception(
+      "has_many can only infer join for a single primary key; ".
+      "${class} has more"
+    ) if $too_many;
+
+    $class->throw_exception(
+      "has_many needs a primary key to infer a join; ".
+      "${class} has none"
+    ) if !defined $pri && (!defined $cond || !length $cond);
 
     my ($f_key,$guess);
     if (defined $cond && length $cond) {
@@ -28,18 +40,20 @@ sub has_many {
     }
 
     my $f_class_loaded = eval { $f_class->columns };
-    $class->throw_exception("No such column ${f_key} on foreign class ${f_class} ($guess)")
-      if $f_class_loaded && !$f_class->has_column($f_key);
-      
+    $class->throw_exception(
+      "No such column ${f_key} on foreign class ${f_class} ($guess)"
+    ) if $f_class_loaded && !$f_class->has_column($f_key);
+
     $cond = { "foreign.${f_key}" => "self.${pri}" };
   }
 
-  $class->add_relationship($rel, $f_class, $cond,
-                            { accessor => 'multi',
-                              join_type => 'LEFT',
-                              cascade_delete => 1,
-                              cascade_copy => 1,
-                              %{$attrs||{}} } );
+  $class->add_relationship($rel, $f_class, $cond, {
+    accessor => 'multi',
+    join_type => 'LEFT',
+    cascade_delete => 1,
+    cascade_copy => 1,
+    %{$attrs||{}}
+  });
 }
 
 1;