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) {
- my ($pri, $too_many) = keys %{ $class->_primaries };
+ 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;
- my $f_class_loaded = eval { $f_class->_columns };
+ my $f_class_loaded = eval { $f_class->columns };
my $guess;
if (defined $cond && length $cond) {
$f_key = $cond;
$guess = "caller specified foreign key '$f_key'";
- } elsif ($f_class_loaded && $f_class->_columns->{$rel}) {
+ } 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 };
+ ($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;
$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 && !exists $f_class->_columns->{$f_key};
+ if $f_class_loaded && !$f_class->has_column($f_key);
$cond = { "foreign.${f_key}" => "self.${pri}" };
}
$class->add_relationship($rel, $f_class,