X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FHasOne.pm;h=4c910b8c667bc82e19c2404820fa0df663b0e114;hb=dc7bcc465e3c824e46290fc802739b1e29892512;hp=bca5e5ba3db5b74958918bda53231bb5044229b3;hpb=e5d98edd1a17b2c57ade1075f8a8049cadd76cc6;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/lib/DBIx/Class/Relationship/HasOne.pm b/lib/DBIx/Class/Relationship/HasOne.pm index bca5e5b..4c910b8 100644 --- a/lib/DBIx/Class/Relationship/HasOne.pm +++ b/lib/DBIx/Class/Relationship/HasOne.pm @@ -1,8 +1,14 @@ -package DBIx::Class::Relationship::HasOne; +package # hide from PAUSE + DBIx::Class::Relationship::HasOne; use strict; use warnings; +our %_pod_inherit_config = + ( + class_map => { 'DBIx::Class::Relationship::HasOne' => 'DBIx::Class::Relationship' } + ); + sub might_have { shift->_has_one('LEFT' => @_); } @@ -13,18 +19,22 @@ sub has_one { sub _has_one { my ($class, $join_type, $rel, $f_class, $cond, $attrs) = @_; - eval "require $f_class"; - if ($@) { - $class->throw($@) unless $@ =~ /Can't locate/; - } - unless (ref $cond) { + $class->ensure_class_loaded($f_class); my ($pri, $too_many) = $class->primary_columns; - $class->throw( "might_have/has_one can only infer join for a single primary key; ${class} has more" ) - if $too_many; - my $f_key; + + $class->throw_exception( + "might_have/has_one can only infer join for a single primary key; ". + "${class} has more" + ) if $too_many; + + $class->throw_exception( + "might_have/has_one needs a primary key to infer a join; ". + "${class} has none" + ) if !defined $pri && (!defined $cond || !length $cond); + 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'"; @@ -33,12 +43,15 @@ sub _has_one { $guess = "using given relationship '$rel' for foreign key"; } else { ($f_key, $too_many) = $f_class->primary_columns; - $class->throw( "might_have/has_one can only infer join for a single primary key; ${f_class} has more" ) - if $too_many; + $class->throw_exception( + "might_have/has_one can only infer join for a single primary key; ". + "${f_class} has more" + ) if $too_many; $guess = "using primary key of foreign class for foreign key"; } - $class->throw("No such column ${f_key} on foreign class ${f_class} ($guess)") - if $f_class_loaded && !$f_class->has_column($f_key); + $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}" }; } $class->add_relationship($rel, $f_class,