X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FBelongsTo.pm;h=050c1e4af0f409dfef93d2e6e08c362e5b7cca7b;hb=9908375297ff0489a6f7dfd1d03d9dd189c2e11a;hp=a4dce6e5bf911f9b33de379405ec7c636e8b7587;hpb=e09b8a14d708819a2f00e5dc411ccddce48c49e8;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Relationship/BelongsTo.pm b/lib/DBIx/Class/Relationship/BelongsTo.pm index a4dce6e..050c1e4 100644 --- a/lib/DBIx/Class/Relationship/BelongsTo.pm +++ b/lib/DBIx/Class/Relationship/BelongsTo.pm @@ -6,6 +6,12 @@ package # hide from PAUSE use strict; use warnings; +use Try::Tiny; + +our %_pod_inherit_config = + ( + class_map => { 'DBIx::Class::Relationship::BelongsTo' => 'DBIx::Class::Relationship' } + ); sub belongs_to { my ($class, $rel, $f_class, $cond, $attrs) = @_; @@ -19,19 +25,14 @@ sub belongs_to { # no join condition or just a column name if (!ref $cond) { $class->ensure_class_loaded($f_class); - my %f_primaries = map { $_ => 1 } eval { $f_class->primary_columns }; - $class->throw_exception( - "Can't infer join condition for ${rel} on ${class}; ". - "unable to load ${f_class}: $@" - ) if $@; + my %f_primaries = map { $_ => 1 } try { $f_class->_pri_cols } + catch { + $class->throw_exception( "Can't infer join condition for ${rel} on ${class}: $_"); + }; my ($pri, $too_many) = keys %f_primaries; $class->throw_exception( "Can't infer join condition for ${rel} on ${class}; ". - "${f_class} has no primary keys" - ) unless defined $pri; - $class->throw_exception( - "Can't infer join condition for ${rel} on ${class}; ". "${f_class} has multiple primary keys" ) if $too_many;