X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FHasOne.pm;h=57885b3690dcc032b3dcca3ada09a45737cea1c0;hb=0b0743afcb6904727aa51cc39fabeea190f5dac6;hp=00bffdb85a54e00c8601998a74374e9e41ddc147;hpb=70c288086248e5a4008490df22a56632341f2473;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/Relationship/HasOne.pm b/lib/DBIx/Class/Relationship/HasOne.pm
index 00bffdb..57885b3 100644
--- a/lib/DBIx/Class/Relationship/HasOne.pm
+++ b/lib/DBIx/Class/Relationship/HasOne.pm
@@ -25,55 +25,43 @@ sub _has_one {
   unless (ref $cond) {
     $class->ensure_class_loaded($f_class);
 
-    my $pri = $class->_get_primary_key;
-
-    $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 $pri = $class->result_source_instance->_single_pri_col_or_die;
 
     my $f_class_loaded = try { $f_class->columns };
-    my ($f_key,$too_many,$guess);
+    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 = $class->_get_primary_key($f_class);
+      $guess = "using given relationship name '$rel' as foreign key column name";
+    } elsif ($f_class_loaded and my $f_pri = try {
+      $f_class->result_source_instance->_single_pri_col_or_die
+    }) {
+      $f_key = $f_pri;
       $guess = "using primary key of foreign class for foreign key";
     }
+
     $class->throw_exception(
-      "No such column ${f_key} on foreign class ${f_class} ($guess)"
+      "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->_validate_has_one_condition($cond);
+
+  my $default_cascade = ref $cond eq 'CODE' ? 0 : 1;
+
   $class->add_relationship($rel, $f_class,
    $cond,
    { accessor => 'single',
-     cascade_update => 1, cascade_delete => 1,
+     cascade_update => $default_cascade,
+     cascade_delete => $default_cascade,
      ($join_type ? ('join_type' => $join_type) : ()),
      %{$attrs || {}} });
   1;
 }
 
-sub _get_primary_key {
-  my ( $class, $target_class ) = @_;
-  $target_class ||= $class;
-  my ($pri, $too_many) = try { $target_class->_pri_cols }
-    catch {
-      $class->throw_exception("Can't infer join condition on ${target_class}: $_");
-    };
-
-  $class->throw_exception(
-    "might_have/has_one can only infer join for a single primary key; ".
-    "${class} has more"
-  ) if $too_many;
-  return $pri;
-}
-
 sub _validate_has_one_condition {
   my ($class, $cond )  = @_;
 
@@ -86,7 +74,7 @@ sub _validate_has_one_condition {
     # warning
     return unless $self_id =~ /^self\.(.*)$/;
     my $key = $1;
-    $class->throw_exception("Defining rel on ${class} that includes ${key} but no such column defined here yet")
+    $class->throw_exception("Defining rel on ${class} that includes '$key' but no such column defined here yet")
         unless $class->has_column($key);
     my $column_info = $class->column_info($key);
     if ( $column_info->{is_nullable} ) {