X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FHasMany.pm;h=e43e9bc597e81da6fc316a4357f63cdeb58c7c83;hb=8fcf21b3a6e010f16ff278b9170a14a0858da388;hp=f30ff50e54a8aae4dfe4e6a1e16c226c55ba5652;hpb=103647d504eeadac7d179057e9f4d5eda0cd7c1b;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Relationship/HasMany.pm b/lib/DBIx/Class/Relationship/HasMany.pm index f30ff50..e43e9bc 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,14 +8,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) = $class->primary_columns; - $class->throw( "has_many can only infer join for a single primary key; ${class} has more" ) + $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 $guess; + + my ($f_key,$guess); if (defined $cond && length $cond) { $f_key = $cond; $guess = "caller specified foreign key '$f_key'"; @@ -23,15 +26,19 @@ 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)") + + 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}" }, + + $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||{}} } ); }