Factored common cdbi rel features out into Relationship:: packages

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / CDBICompat / HasA.pm

diff --git a/lib/DBIx/Class/CDBICompat/HasA.pm b/lib/DBIx/Class/CDBICompat/HasA.pm
index fe85214..7f86b25 100644 (file)
--- a/lib/DBIx/Class/CDBICompat/HasA.pm
+++ b/lib/DBIx/Class/CDBICompat/HasA.pm
@@ -4,24 +4,27 @@ use strict;
 use warnings;
 
 sub has_a {
-  my ($self, $col, $f_class) = @_;
+  my ($self, $col, $f_class, %args) = @_;
   $self->throw( "No such column ${col}" ) unless $self->_columns->{$col};
   eval "require $f_class";
+  if ($args{'inflate'} || $args{'deflate'}) {
+    if (!ref $args{'inflate'}) {
+      my $meth = $args{'inflate'};
+      $args{'inflate'} = sub { $f_class->$meth(shift); };
+    }
+    if (!ref $args{'deflate'}) {
+      my $meth = $args{'deflate'};
+      $args{'deflate'} = sub { shift->$meth; };
+    }
+    $self->inflate_column($col, \%args);
+    return 1;
+  }
   my ($pri, $too_many) = keys %{ $f_class->_primaries };
   $self->throw( "has_a only works with a single primary key; ${f_class} has more" )
     if $too_many;
   $self->add_relationship($col, $f_class,
                             { "foreign.${pri}" => "self.${col}" },
-                            { _type => 'has_a' } );
-  $self->inflate_column($col,
-    { inflate => sub { 
-        my ($val, $self) = @_;
-        return ($self->search_related($col, {}, {}))[0]
-          || $f_class->new({ $pri => $val }); },
-      deflate => sub {
-        my ($val, $self) = @_;
-        $self->throw("$val isn't a $f_class") unless $val->isa($f_class);
-        return ($val->_ident_values)[0] } } );
+                            { _type => 'has_a', accessor => 'filter' } );
   return 1;
 }