X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FHasMany.pm;h=aa46486a55af0a44dea3b09223ee5710834b223c;hb=89279e9d0fff6fe2b90d0e3624c0349403c724f7;hp=fdf5dd6af2e0b3cc2c06470d44e4e182147a62a1;hpb=bfab575afa37545ee175b824cea554c9c37ab6f5;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/lib/DBIx/Class/Relationship/HasMany.pm b/lib/DBIx/Class/Relationship/HasMany.pm index fdf5dd6..aa46486 100644 --- a/lib/DBIx/Class/Relationship/HasMany.pm +++ b/lib/DBIx/Class/Relationship/HasMany.pm @@ -1,23 +1,20 @@ -package DBIx::Class::Relationship::HasMany; +package # hide from PAUSE + DBIx::Class::Relationship::HasMany; use strict; use warnings; sub has_many { my ($class, $rel, $f_class, $cond, $attrs) = @_; - - eval "require $f_class"; - if ($@) { - $class->throw($@) unless $@ =~ /Can't locate/; - } + + $class->ensure_class_loaded($f_class); 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'"; @@ -26,15 +23,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||{}} } ); }