X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FBelongsTo.pm;h=50ddc2eb446ada4e0dff0f2ae27817eaabce50c6;hb=e570488ade8f327f47dd3318db3443a348d561d6;hp=7435d7b0d122edf818b1f5a1c01448660c225086;hpb=55de06f116aadb02326d4613a4db7117941e5350;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Relationship/BelongsTo.pm b/lib/DBIx/Class/Relationship/BelongsTo.pm
index 7435d7b..50ddc2e 100644
--- a/lib/DBIx/Class/Relationship/BelongsTo.pm
+++ b/lib/DBIx/Class/Relationship/BelongsTo.pm
@@ -1,53 +1,105 @@
-package DBIx::Class::Relationship::BelongsTo;
+package # hide from PAUSE
+    DBIx::Class::Relationship::BelongsTo;
+
+# Documentation for these methods can be found in
+# DBIx::Class::Relationship
 
 use strict;
 use warnings;
+use Try::Tiny;
+use DBIx::Class::_Util 'dbic_internal_try';
+use namespace::clean;
+
+our %_pod_inherit_config =
+  (
+   class_map => { 'DBIx::Class::Relationship::BelongsTo' => 'DBIx::Class::Relationship' }
+  );
 
 sub belongs_to {
   my ($class, $rel, $f_class, $cond, $attrs) = @_;
-  eval "require $f_class";
-  if ($@) {
-    $class->throw($@) unless $@ =~ /Can't locate/;
-  }
 
-  my %f_primaries;
-  $f_primaries{$_} = 1 for eval { $f_class->primary_columns };
-  my $f_loaded = !$@;
-  # single key relationship
-  if (not defined $cond) {
-    $class->throw("Can't infer join condition for ${rel} on ${class}; unable to load ${f_class}") unless $f_loaded;
-    my ($pri, $too_many) = keys %f_primaries;
-    $class->throw("Can't infer join condition for ${rel} on ${class}; ${f_class} has multiple primary key") if $too_many;
-    my $acc_type = ($class->has_column($rel)) ? 'filter' : 'single';
-    $class->add_relationship($rel, $f_class,
-      { "foreign.${pri}" => "self.${rel}" },
-      { accessor => $acc_type, %{$attrs || {}} }
-    );
+  # assume a foreign key constraint unless defined otherwise
+  $attrs->{is_foreign_key_constraint} = 1
+    if not exists $attrs->{is_foreign_key_constraint};
+  $attrs->{undef_on_null_fk} = 1
+    if not exists $attrs->{undef_on_null_fk};
+
+  # no join condition or just a column name
+  if (!ref $cond) {
+
+    my ($f_key, $guess);
+    if (defined $cond and length $cond) {
+      $f_key = $cond;
+      $guess = "caller specified foreign key '$f_key'";
+    }
+    else {
+      $f_key = $rel;
+      $guess = "using given relationship name '$rel' as foreign key column name";
+    }
+
+    $class->throw_exception(
+      "No such column '$f_key' declared yet on ${class} ($guess)"
+    )  unless $class->result_source->has_column($f_key);
+
+    $class->ensure_class_loaded($f_class);
+    my $f_rsrc = dbic_internal_try {
+      $f_class->result_source;
+    }
+    catch {
+      $class->throw_exception(
+        "Foreign class '$f_class' does not seem to be a Result class "
+      . "(or it simply did not load entirely due to a circular relation chain): $_"
+      );
+    };
+
+    my $pri = $f_rsrc->_single_pri_col_or_die;
+
+    $cond = { "foreign.${pri}" => "self.${f_key}" };
+
   }
-  # multiple key relationship
+  # explicit join condition
   else {
-    my $cond_rel;
-    for (keys %$cond) {
-      if (m/\./) { # Explicit join condition
-        $cond_rel = $cond;
-        last;
+    if (ref $cond eq 'HASH') { # ARRAY is also valid
+      my $cond_rel;
+      # FIXME This loop is ridiculously incomplete and dangerous
+      # staving off changes until implmentation of the swindon consensus
+      for (keys %$cond) {
+        if (m/\./) { # Explicit join condition
+          $cond_rel = $cond;
+          last;
+        }
+        $cond_rel->{"foreign.$_"} = "self.".$cond->{$_};
       }
-      $cond_rel->{"foreign.$_"} = "self.".$cond->{$_};
+      $cond = $cond_rel;
     }
-    $class->add_relationship($rel, $f_class,
-      $cond_rel,
-      { accessor => 'single', %{$attrs || {}} }
-    );
   }
-  return 1;
-}
 
-=head1 AUTHORS
+  my $acc_type = (
+    ref $cond eq 'HASH'
+      and
+    keys %$cond == 1
+      and
+    (keys %$cond)[0] =~ /^foreign\./
+      and
+    $class->result_source->has_column($rel)
+  ) ? 'filter' : 'single';
 
-Alexander Hartmaier <Alexander.Hartmaier@t-systems.at>
+  my $fk_columns = ($acc_type eq 'single' and ref $cond eq 'HASH')
+    ? { map { $_ =~ /^self\.(.+)/ ? ( $1 => 1 ) : () } (values %$cond ) }
+    : undef
+  ;
 
-Matt S. Trout <mst@shadowcatsystems.co.uk>
+  $class->add_relationship($rel, $f_class,
+    $cond,
+    {
+      is_depends_on => 1,
+      accessor => $acc_type,
+      $fk_columns ? ( fk_columns => $fk_columns ) : (),
+      %{$attrs || {}}
+    }
+  );
 
-=cut
+  return 1;
+}
 
 1;