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 6128f7a..b9ab33d 100644 (file)
--- a/lib/DBIx/Class/Relationship/HasOne.pm
+++ b/lib/DBIx/Class/Relationship/HasOne.pm
@@ -3,40 +3,47 @@ package DBIx::Class::Relationship::HasOne;
 use strict;
 use warnings;
 
+sub might_have {
+  shift->_has_one('LEFT' => @_);
+}
+
 sub has_one {
-  my ($class, $acc_name, $f_class, $cond) = @_;
+  shift->_has_one(undef => @_);
+}
+
+sub _has_one {
+  my ($class, $join_type, $rel, $f_class, $cond, $attrs) = @_;
   eval "require $f_class";
-  # single key relationship
-  if (not defined $cond) {
-    my ($pri, $too_many) = keys %{ $f_class->_primaries };
-    my $acc_type = ($class->_columns->{$acc_name}) ? 'filter' : 'single';
-    $class->add_relationship($acc_name, $f_class,
-      { "foreign.${pri}" => "self.${acc_name}" },
-      { accessor => $acc_type }
-    );
-  }
-  # multiple key relationship
-  else {
-    my %f_primaries = %{ $f_class->_primaries };
-    my $cond_rel;
-    for (keys %$cond) {
-      $cond_rel->{"foreign.$_"} = "self.".$cond->{$_};
-      # primary key usage checks
-      if (exists $f_primaries{$_}) {
-        delete $f_primaries{$_};
-      }
-      else
-      {
-        $class->throw("non primary key used in join condition: $_");
-      }
+  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;
+    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";
     }
-    $class->throw("not all primary keys used in multi key relationship!") if keys %f_primaries;
-    $class->add_relationship($acc_name, $f_class,
-      $cond_rel,
-      { accessor => 'single' }
-    );
+    $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}" };
   }
-  return 1;
+  $class->add_relationship($rel, $f_class,
+   $cond,
+   { accessor => 'single',
+     cascade_update => 1, cascade_delete => 1,
+     ($join_type ? ('join_type' => $join_type) : ()),
+     %{$attrs || {}} });
+  1;
 }
 
 1;