X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FHasMany.pm;h=a709d6a3b598b2df239243866d8f21e36f9f8008;hb=de60a93dfda2e3384c2f6a00d55b352a4b4188c0;hp=2efebb7dd76e1bfea0eca94eb711535ef3da8665;hpb=07037f89d4d9bf97c59a2c083de74f669521da47;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Relationship/HasMany.pm b/lib/DBIx/Class/Relationship/HasMany.pm
index 2efebb7..a709d6a 100644
--- a/lib/DBIx/Class/Relationship/HasMany.pm
+++ b/lib/DBIx/Class/Relationship/HasMany.pm
@@ -1,4 +1,5 @@
-package DBIx::Class::Relationship::HasMany;
+package # hide from PAUSE
+    DBIx::Class::Relationship::HasMany;
 
 use strict;
 use warnings;
@@ -7,29 +8,37 @@ 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;
 
-  if (!ref $cond) {
-    my $f_key;
+    my ($f_key,$guess);
     if (defined $cond && length $cond) {
       $f_key = $cond;
-      $class->throw( "No such column ${f_key} on foreign class ${f_class}" )
-        unless ($@ || $f_class->_columns->{$f_key});
+      $guess = "caller specified foreign key '$f_key'";
     } else {
       $class =~ /([^\:]+)$/;
-      $f_key = lc $1 if $f_class->_columns->{lc $1};
-      $class->throw( "Unable to resolve foreign key for has_many from ${class} to ${f_class}" )
-        unless $f_key;
+      $f_key = lc $1; # go ahead and guess; best we can do
+      $guess = "using our class name '$class' as foreign key";
     }
-    my ($pri, $too_many) = keys %{ $class->_primaries };
-    $class->throw( "has_many can only infer join for a single primary key; ${class} has more" )
-      if $too_many;
-    $cond = { "foreign.${f_key}" => "self.${pri}" },
+
+    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);
+      
+    $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||{}} } );
 }