X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FHasMany.pm;h=a709d6a3b598b2df239243866d8f21e36f9f8008;hb=de60a93dfda2e3384c2f6a00d55b352a4b4188c0;hp=1e61c743725ba01dc0c67ab9a7cf4e8207a04b03;hpb=333cce60480be0ebce201d37e2bfb18601b54404;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/lib/DBIx/Class/Relationship/HasMany.pm b/lib/DBIx/Class/Relationship/HasMany.pm index 1e61c74..a709d6a 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; @@ -15,9 +16,8 @@ sub has_many { 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 $guess; + + my ($f_key,$guess); if (defined $cond && length $cond) { $f_key = $cond; $guess = "caller specified foreign key '$f_key'"; @@ -26,9 +26,12 @@ sub has_many { $f_key = lc $1; # go ahead and guess; best we can do $guess = "using our class name '$class' as foreign key"; } + + 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,