Refactored HasA to use InflateColumn

[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 43f7609..fe85214 100644 (file)
--- a/lib/DBIx/Class/CDBICompat/HasA.pm
+++ b/lib/DBIx/Class/CDBICompat/HasA.pm
@@ -13,75 +13,16 @@ sub has_a {
   $self->add_relationship($col, $f_class,
                             { "foreign.${pri}" => "self.${col}" },
                             { _type => 'has_a' } );
-  $self->mk_group_accessors('has_a' => $col);
+  $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] } } );
   return 1;
 }
 
-sub get_has_a {
-  my ($self, $rel) = @_;
-  #warn $rel;
-  #warn join(', ', %{$self->{_column_data}});
-  return $self->{_relationship_data}{$rel}
-    if $self->{_relationship_data}{$rel};
-  return undef unless $self->get_column($rel);
-  #my ($pri) = (keys %{$self->_relationships->{$rel}{class}->_primaries})[0];
-  return $self->{_relationship_data}{$rel} =
-           ($self->search_related($rel, {}, {}))[0]
-           || do { 
-                my $f_class = $self->_relationships->{$rel}{class};
-                my ($pri) = keys %{$f_class->_primaries};
-                $f_class->new({ $pri => $self->get_column($rel) }); };
-}
-
-sub set_has_a {
-  my ($self, $rel, @rest) = @_;
-  my $ret = $self->store_has_a($rel, @rest);
-  $self->{_dirty_columns}{$rel} = 1;
-  return $ret;
-}
-
-sub store_has_a {
-  my ($self, $rel, $obj) = @_;
-  unless (ref $obj) {
-    delete $self->{_relationship_data}{$rel};
-    return $self->store_column($rel, $obj);
-  }
-  my $rel_obj = $self->_relationships->{$rel};
-  $self->throw( "Can't set $rel: object $obj is not of class ".$rel_obj->{class} )
-     unless $obj->isa($rel_obj->{class});
-  $self->{_relationship_data}{$rel} = $obj;
-  #warn "Storing $obj: ".($obj->_ident_values)[0];
-  $self->store_column($rel, ($obj->_ident_values)[0]);
-  return $obj;
-}
-
-sub new {
-  my ($class, $attrs, @rest) = @_;
-  my %hasa;
-  foreach my $key (keys %$attrs) {
-    my $rt = $class->_relationships->{$key}{attrs}{_type};
-    next unless $rt && $rt eq 'has_a' && ref $attrs->{$key};
-    $hasa{$key} = delete $attrs->{$key};
-  }
-  my $new = $class->NEXT::ACTUAL::new($attrs, @rest);
-  foreach my $key (keys %hasa) {
-    $new->store_has_a($key, $hasa{$key});
-  }
-  return $new;
-}
-
-sub _cond_value {
-  my ($self, $attrs, $key, $value) = @_;
-  if ( my $rel_obj = $self->_relationships->{$key} ) {
-    my $rel_type = $rel_obj->{attrs}{_type} || '';
-    if ($rel_type eq 'has_a' && ref $value) {
-      $self->throw( "Object $value is not of class ".$rel_obj->{class} )
-         unless $value->isa($rel_obj->{class});
-      $value = ($value->_ident_values)[0];
-      #warn $value;
-    }
-  }
-  return $self->NEXT::ACTUAL::_cond_value($attrs, $key, $value);
-}
-
 1;