X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FHasMany.pm;h=6ef09fb74ce0661757e8509e8be70f90d2d9e178;hb=e570488ade8f327f47dd3318db3443a348d561d6;hp=a709d6a3b598b2df239243866d8f21e36f9f8008;hpb=75d079145a507a0e5ff89b2676d383f4fd1a5511;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Relationship/HasMany.pm b/lib/DBIx/Class/Relationship/HasMany.pm
index a709d6a..6ef09fb 100644
--- a/lib/DBIx/Class/Relationship/HasMany.pm
+++ b/lib/DBIx/Class/Relationship/HasMany.pm
@@ -3,43 +3,52 @@ package # hide from PAUSE
 
 use strict;
 use warnings;
+use DBIx::Class::_Util 'dbic_internal_try';
+use namespace::clean;
+
+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;
+
+    my $pri = $class->result_source->_single_pri_col_or_die;
 
     my ($f_key,$guess);
     if (defined $cond && length $cond) {
       $f_key = $cond;
       $guess = "caller specified foreign key '$f_key'";
     } else {
-      $class =~ /([^\:]+)$/;
+      $class =~ /([^\:]+)$/;  # match is safe - $class can't be ''
       $f_key = lc $1; # go ahead and guess; best we can do
-      $guess = "using our class name '$class' as foreign key";
+      $guess = "using our class name '$class' as foreign key source";
     }
 
-    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);
-      
+# FIXME - this check needs to be moved to schema-composition time...
+#    # only perform checks if the far side appears already loaded
+#    if (my $f_rsrc = dbic_internal_try { $f_class->result_source } ) {
+#      $class->throw_exception(
+#        "No such column '$f_key' on foreign class ${f_class} ($guess)"
+#      ) if !$f_rsrc->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||{}} } );
+  my $default_cascade = ref $cond eq 'CODE' ? 0 : 1;
+
+  $class->add_relationship($rel, $f_class, $cond, {
+    accessor => 'multi',
+    join_type => 'LEFT',
+    cascade_delete => $default_cascade,
+    cascade_copy => $default_cascade,
+    is_depends_on => 0,
+    %{$attrs||{}}
+  });
 }
 
 1;