X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRelationship%2FAccessor.pm;h=40deeafa43890b115aa508c9534d9e30c1b959e1;hb=139e7991dd0542b926ad9cac8de3711e4c716e13;hp=3a12f283633b322004141c8e509f7a02387de600;hpb=a9da9b6a57a597bc7e52c7e7ad7221eaa7ee6d14;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/Relationship/Accessor.pm b/lib/DBIx/Class/Relationship/Accessor.pm
index 3a12f28..40deeaf 100644
--- a/lib/DBIx/Class/Relationship/Accessor.pm
+++ b/lib/DBIx/Class/Relationship/Accessor.pm
@@ -3,9 +3,8 @@ package # hide from PAUSE
 
 use strict;
 use warnings;
-use Sub::Name;
 use DBIx::Class::Carp;
-use DBIx::Class::_Util 'fail_on_internal_wantarray';
+use DBIx::Class::_Util qw(quote_sub perlstring);
 use namespace::clean;
 
 our %_pod_inherit_config =
@@ -23,81 +22,91 @@ sub register_relationship {
 
 sub add_relationship_accessor {
   my ($class, $rel, $acc_type) = @_;
-  my %meth;
+
   if ($acc_type eq 'single') {
-    my $rel_info = $class->relationship_info($rel);
-    $meth{$rel} = sub {
+    quote_sub "${class}::${rel}" => sprintf(<<'EOC', perlstring $rel);
       my $self = shift;
+
       if (@_) {
-        $self->set_from_related($rel, @_);
-        return $self->{_relationship_data}{$rel} = $_[0];
-      } elsif (exists $self->{_relationship_data}{$rel}) {
-        return $self->{_relationship_data}{$rel};
-      } else {
-        my $cond = $self->result_source->_resolve_condition(
-          $rel_info->{cond}, $rel, $self, $rel
+        $self->set_from_related( %1$s => @_ );
+        return $self->{_relationship_data}{%1$s} = $_[0];
+      }
+      elsif (exists $self->{_relationship_data}{%1$s}) {
+        return $self->{_relationship_data}{%1$s};
+      }
+      else {
+        my $relcond = $self->result_source->_resolve_relationship_condition(
+          rel_name => %1$s,
+          foreign_alias => %1$s,
+          self_alias => 'me',
+          self_result_object => $self,
+        );
+
+        return undef if (
+          $relcond->{join_free_condition}
+            and
+          $relcond->{join_free_condition} ne DBIx::Class::_Util::UNRESOLVABLE_CONDITION
+            and
+          scalar grep { not defined $_ } values %%{ $relcond->{join_free_condition} || {} }
+            and
+          $self->result_source->relationship_info(%1$s)->{attrs}{undef_on_null_fk}
         );
-        if ($rel_info->{attrs}->{undef_on_null_fk}){
-          return undef unless ref($cond) eq 'HASH';
-          return undef if grep { not defined $_ } values %$cond;
-        }
-        my $val = $self->find_related($rel, {}, {});
+
+        my $val = $self->search_related( %1$s )->single;
         return $val unless $val;  # $val instead of undef so that null-objects can go through
 
-        return $self->{_relationship_data}{$rel} = $val;
+        return $self->{_relationship_data}{%1$s} = $val;
       }
-    };
-  } elsif ($acc_type eq 'filter') {
+EOC
+  }
+  elsif ($acc_type eq 'filter') {
     $class->throw_exception("No such column '$rel' to filter")
        unless $class->has_column($rel);
+
     my $f_class = $class->relationship_info($rel)->{class};
-    $class->inflate_column($rel,
-      { inflate => sub {
-          my ($val, $self) = @_;
-          return $self->find_or_new_related($rel, {}, {});
-        },
-        deflate => sub {
-          my ($val, $self) = @_;
-          $self->throw_exception("'$val' isn't a $f_class") unless $val->isa($f_class);
-
-          # MASSIVE FIXME - this code assumes we pointed at the PK, but the belongs_to
-          # helper does not check any of this
-          # fixup the code a bit to make things saner, but ideally 'filter' needs to
-          # be deprecated ASAP and removed shortly after
-          # Not doing so before 0.08250 however, too many things in motion already
-          my ($pk_col, @rest) = $val->result_source->_pri_cols_or_die;
-          $self->throw_exception(
-            "Relationship '$rel' of type 'filter' can not work with a multicolumn primary key on source '$f_class'"
-          ) if @rest;
-
-          my $pk_val = $val->get_column($pk_col);
-          carp_unique (
-            "Unable to deflate 'filter'-type relationship '$rel' (related object "
-          . "primary key not retrieved), assuming undef instead"
-          ) if ( ! defined $pk_val and $val->in_storage );
-
-          return $pk_val;
-        }
-      }
-    );
-  } elsif ($acc_type eq 'multi') {
-    $meth{$rel} = sub {
-      DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_WANTARRAY and wantarray and my $sog = fail_on_internal_wantarray($_[0]);
-      shift->search_related($rel, @_)
-    };
-    $meth{"${rel}_rs"} = sub { shift->search_related_rs($rel, @_) };
-    $meth{"add_to_${rel}"} = sub { shift->create_related($rel, @_); };
-  } else {
-    $class->throw_exception("No such relationship accessor type '$acc_type'");
+
+    $class->inflate_column($rel, {
+      inflate => sub {
+        my ($val, $self) = @_;
+        return $self->find_or_new_related($rel, {}, {});
+      },
+      deflate => sub {
+        my ($val, $self) = @_;
+        $self->throw_exception("'$val' isn't a $f_class") unless $val->isa($f_class);
+
+        # MASSIVE FIXME - this code assumes we pointed at the PK, but the belongs_to
+        # helper does not check any of this
+        # fixup the code a bit to make things saner, but ideally 'filter' needs to
+        # be deprecated ASAP and removed shortly after
+        # Not doing so before 0.08250 however, too many things in motion already
+        my ($pk_col, @rest) = $val->result_source->_pri_cols_or_die;
+        $self->throw_exception(
+          "Relationship '$rel' of type 'filter' can not work with a multicolumn primary key on source '$f_class'"
+        ) if @rest;
+
+        my $pk_val = $val->get_column($pk_col);
+        carp_unique (
+          "Unable to deflate 'filter'-type relationship '$rel' (related object "
+        . "primary key not retrieved), assuming undef instead"
+        ) if ( ! defined $pk_val and $val->in_storage );
+
+        return $pk_val;
+      },
+    });
   }
-  {
-    no strict 'refs';
-    no warnings 'redefine';
-    foreach my $meth (keys %meth) {
-      my $name = join '::', $class, $meth;
-      *$name = subname($name, $meth{$meth});
-    }
+  elsif ($acc_type eq 'multi') {
+
+    quote_sub "${class}::${rel}_rs", "shift->search_related_rs( $rel => \@_ )";
+    quote_sub "${class}::add_to_${rel}", "shift->create_related( $rel => \@_ )";
+    quote_sub "${class}::${rel}", sprintf( <<'EOC', perlstring $rel );
+      DBIx::Class::_ENV_::ASSERT_NO_INTERNAL_WANTARRAY and my $sog = DBIx::Class::_Util::fail_on_internal_wantarray;
+      shift->search_related( %s => @_ )
+EOC
+  }
+  else {
+    $class->throw_exception("No such relationship accessor type '$acc_type'");
   }
+
 }
 
 1;