X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FHasMany.pm;h=d74a9a4abcee236911b45e0ce4c489b78e1301ce;hb=d4daee7b54e38e4b3d3d0a77759bddc1a4ede6e5;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..d74a9a4 100644 --- a/lib/DBIx/Class/Relationship/HasMany.pm +++ b/lib/DBIx/Class/Relationship/HasMany.pm @@ -1,20 +1,32 @@ -package DBIx::Class::Relationship::HasMany; +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"; 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" ) - if $too_many; - my $f_key; - my $f_class_loaded = eval { $f_class->_columns }; - my $guess; + $class->ensure_class_loaded($f_class); + 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->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) { $f_key = $cond; $guess = "caller specified foreign key '$f_key'"; @@ -23,16 +35,22 @@ 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}" }, + + 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, - %{$attrs||{}} } ); + $class->add_relationship($rel, $f_class, $cond, { + accessor => 'multi', + join_type => 'LEFT', + cascade_delete => 1, + cascade_copy => 1, + %{$attrs||{}} + }); } 1;