-package DBIx::Class::Relationship::HasOne;
+package # hide from PAUSE
+ DBIx::Class::Relationship::HasOne;
use strict;
use warnings;
}
sub has_one {
- shift->_has_one(undef => @_);
+ shift->_has_one(undef() => @_);
}
sub _has_one {
my ($class, $join_type, $rel, $f_class, $cond, $attrs) = @_;
unless (ref $cond) {
- my ($pri, $too_many) = keys %{ $class->_primaries };
- $class->throw( "might_have/has_one can only infer join for a single primary key; ${class} has more" )
- if $too_many;
- my $f_key;
- if ($cond) {
+ $class->ensure_class_loaded($f_class);
+ my ($pri, $too_many) = $class->primary_columns;
+
+ $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 ($f_key,$guess);
+ if (defined $cond && length $cond) {
$f_key = $cond;
- } elsif ($f_class->_columns->{$rel}) {
+ $guess = "caller specified foreign key '$f_key'";
+ } elsif ($f_class_loaded && $f_class->has_column($rel)) {
$f_key = $rel;
+ $guess = "using given relationship '$rel' for foreign key";
} else {
- ($f_key, $too_many) = keys %{ $f_class->_primaries };
- $class->throw( "might_have/has_one can only infer join for a single primary key; ${f_class} has more" )
- if $too_many;
+ ($f_key, $too_many) = $f_class->primary_columns;
+ $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_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,