X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FHasMany.pm;h=7690af895c4dd3f56abe955f1dd30802f9cf1665;hb=956f4141284c6b2f216de47a09ffa16928df38fc;hp=6bdefd472eaf27b2521da14b754b84d73774340a;hpb=e36de82e983b60c6621c9458f686f1073b6a8f6b;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/lib/DBIx/Class/Relationship/HasMany.pm b/lib/DBIx/Class/Relationship/HasMany.pm index 6bdefd4..7690af8 100644 --- a/lib/DBIx/Class/Relationship/HasMany.pm +++ b/lib/DBIx/Class/Relationship/HasMany.pm @@ -4,12 +4,20 @@ package # hide from PAUSE 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) = @_; unless (ref $cond) { $class->ensure_class_loaded($f_class); - my ($pri, $too_many) = $class->primary_columns; + my ($pri, $too_many) = eval { $class->_pri_cols }; + $class->throw_exception( + "Can't infer join condition for ${rel} on ${class}: $@" + ) if $@; $class->throw_exception( "has_many can only infer join for a single primary key; ". @@ -35,7 +43,7 @@ sub has_many { $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}" }; }