X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FHasOne.pm;h=543649b5f571debc43801c5636b927d381c324fa;hb=5d62876f5fe86bc1b3a11a571074164bcce27e7b;hp=dc2e4367ab59aad102d5601b428288780673797d;hpb=22b15c96c84ddc1aeddddac637ca4c59a6465dcf;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Relationship/HasOne.pm b/lib/DBIx/Class/Relationship/HasOne.pm
index dc2e436..543649b 100644
--- a/lib/DBIx/Class/Relationship/HasOne.pm
+++ b/lib/DBIx/Class/Relationship/HasOne.pm
@@ -1,42 +1,61 @@
-package DBIx::Class::Relationship::HasOne;
+package # hide from PAUSE
+    DBIx::Class::Relationship::HasOne;
 
 use strict;
 use warnings;
 
+sub might_have {
+  shift->_has_one('LEFT' => @_);
+}
+
 sub has_one {
-  my ($class, $acc_name, $f_class, $conds, $args) = @_;
-  eval "require $f_class";
-  # single key relationship
-  if (not defined $conds && not defined $args) {
-    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 $conds_rel;
-    for (keys %$conds) {
-      $conds_rel->{"foreign.$_"} = "self.".$conds->{$_};
-      # primary key usage checks
-      if (exists $f_primaries{$_}) {
-        delete $f_primaries{$_};
-      }
-      else
-      {
-        $class->throw("non primary key used in join condition: $_");
-      }
+  shift->_has_one(undef() => @_);
+}
+
+sub _has_one {
+  my ($class, $join_type, $rel, $f_class, $cond, $attrs) = @_;
+  unless (ref $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;
+      $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) = $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("not all primary keys used in multi key relationship!") if keys %f_primaries;
-    $class->add_relationship($acc_name, $f_class,
-      $conds_rel,
-      { accessor => 'single' }
-    );
+    $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}" };
   }
-  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;