Bugfixes, optimisations

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / Relationship / HasOne.pm

diff --git a/lib/DBIx/Class/Relationship/HasOne.pm b/lib/DBIx/Class/Relationship/HasOne.pm
index ea97e7d..b9ab33d 100644 (file)
--- a/lib/DBIx/Class/Relationship/HasOne.pm
+++ b/lib/DBIx/Class/Relationship/HasOne.pm
@@ -12,36 +12,37 @@ sub has_one {
 }
 
 sub _has_one {
-  my ($class, $join_type, $rel, $f_class, @columns) = @_;
-  my $cond;
-  if (ref $columns[0]) {
-    $cond = shift @columns;
-  } else {
+  my ($class, $join_type, $rel, $f_class, $cond, $attrs) = @_;
+  eval "require $f_class";
+  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 ($f_class->_columns->{$rel}) {
+    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}) {
       $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;
+      $guess = "using primary key of foreign class for foreign key";
     }
-    $cond = { "foreign.${f_key}" => "self.${pri}" },
+    $class->throw("No such column ${f_key} on foreign class ${f_class} ($guess)")
+      if $f_class_loaded && !exists $f_class->_columns->{$f_key}; 
+    $cond = { "foreign.${f_key}" => "self.${pri}" };
   }
-  shift(@columns) unless defined $columns[0]; # Explicit empty condition
-  my %attrs;
-  if (ref $columns[0] eq 'HASH') {
-    %attrs = %{shift @columns};
-  }
-  shift(@columns) unless defined $columns[0]; # Explicit empty attrs
   $class->add_relationship($rel, $f_class,
    $cond,
-   { accessor => 'single', (@columns ? (proxy => \@columns) : ()),
+   { accessor => 'single',
      cascade_update => 1, cascade_delete => 1,
      ($join_type ? ('join_type' => $join_type) : ()),
-     %attrs });
+     %{$attrs || {}} });
   1;
 }