X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FHasMany.pm;h=864eaac9b300e6ce76845e22cf8bf8d5f6772d3a;hb=8e04bf91b7324ae925517cfa5d8398bc30f795a6;hp=00dd98658d59a6de1b4db2bf99f6430f727b3e13;hpb=dcf8330b075eee8c71d30e0fa31289d162482fe4;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Relationship/HasMany.pm b/lib/DBIx/Class/Relationship/HasMany.pm
index 00dd986..864eaac 100644
--- a/lib/DBIx/Class/Relationship/HasMany.pm
+++ b/lib/DBIx/Class/Relationship/HasMany.pm
@@ -7,13 +7,16 @@ 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) = keys %{ $class->_primaries };
-    $class->throw( "has_many can only infer join for a single primary key; ${class} has more" )
+    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;
     my $f_key;
-    my $f_class_loaded = eval { $f_class->_columns };
+    my $f_class_loaded = eval { $f_class->columns };
     my $guess;
     if (defined $cond && length $cond) {
       $f_key = $cond;
@@ -23,15 +26,16 @@ sub has_many {
       $f_key = lc $1; # go ahead and guess; best we can do
       $guess = "using our class name '$class' as foreign key";
     }
-    $class->throw("No such column ${f_key} on foreign class ${f_class} ($guess)")
-      if $f_class_loaded && !exists $f_class->_columns->{$f_key}; 
-    $cond = { "foreign.${f_key}" => "self.${pri}" },
+    $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||{}} } );
 }