Added has_column and column_info methods

[dbsrgits/DBIx-Class.git] / lib / DBIx / Class / InflateColumn.pm

diff --git a/lib/DBIx/Class/InflateColumn.pm b/lib/DBIx/Class/InflateColumn.pm
index 27ac2db..01d9e33 100644 (file)
--- a/lib/DBIx/Class/InflateColumn.pm
+++ b/lib/DBIx/Class/InflateColumn.pm
@@ -5,39 +5,42 @@ use warnings;
 
 sub inflate_column {
   my ($self, $col, $attrs) = @_;
-  die "No such column $col to inflate" unless exists $self->_columns->{$col};
+  die "No such column $col to inflate" unless $self->has_column($col);
   die "inflate_column needs attr hashref" unless ref $attrs eq 'HASH';
-  $self->_columns->{$col}{_inflate_info} = $attrs;
+  $self->column_info($col)->{_inflate_info} = $attrs;
   $self->mk_group_accessors('inflated_column' => $col);
   return 1;
 }
 
-sub _inflate_column_value {
+sub _inflated_column {
   my ($self, $col, $value) = @_;
-  return $value unless exists $self->_columns->{$col}{_inflate_info}{inflate};
-  my $inflate = $self->_columns->{$col}{_inflate_info}{inflate};
+  return $value unless defined $value; # NULL is NULL is NULL
+  my $info = $self->column_info($col) || die "No column info for $col";
+  return $value unless exists $info->{_inflate_info};
+  my $inflate = $info->{_inflate_info}{inflate};
+  die "No inflator for $col" unless defined $inflate;
   return $inflate->($value, $self);
 }
 
-sub _deflate_column_value {
+sub _deflated_column {
   my ($self, $col, $value) = @_;
   return $value unless ref $value; # If it's not an object, don't touch it
-  return $value unless exists $self->_columns->{$col}{_inflate_info}{deflate};
-  my $deflate = $self->_columns->{$col}{_inflate_info}{deflate};
+  my $info = $self->column_info($col) || die "No column info for $col";
+  return $value unless exists $info->{_inflate_info};
+  my $deflate = $info->{_inflate_info}{deflate};
+  die "No deflator for $col" unless defined $deflate;
   return $deflate->($value, $self);
 }
 
 sub get_inflated_column {
   my ($self, $col) = @_;
   $self->throw("$col is not an inflated column") unless
-    exists $self->_columns->{$col}{_inflate_info};
-  #warn $rel;
-  #warn join(', ', %{$self->{_column_data}});
+    exists $self->column_info($col)->{_inflate_info};
+
   return $self->{_inflated_column}{$col}
     if exists $self->{_inflated_column}{$col};
-  #my ($pri) = (keys %{$self->_relationships->{$rel}{class}->_primaries})[0];
   return $self->{_inflated_column}{$col} =
-           $self->_inflate_column_value($col, $self->get_column($col));
+           $self->_inflated_column($col, $self->get_column($col));
 }
 
 sub set_inflated_column {
@@ -53,31 +56,26 @@ sub store_inflated_column {
     delete $self->{_inflated_column}{$col};
     return $self->store_column($col, $obj);
   }
+
+  my $deflated = $self->_deflated_column($col, $obj);
+           # Do this now so we don't store if it's invalid
+
   $self->{_inflated_column}{$col} = $obj;
   #warn "Storing $obj: ".($obj->_ident_values)[0];
-  $self->store_column($col, $self->_deflate_column_value($col, $obj));
+  $self->store_column($col, $deflated);
   return $obj;
 }
 
 sub new {
   my ($class, $attrs, @rest) = @_;
   $attrs ||= {};
-  my %deflated;
   foreach my $key (keys %$attrs) {
-    if (exists $class->_columns->{$key}{_inflate_info}) {
-      $deflated{$key} = $class->_deflate_column_value($key,
-                                                        delete $attrs->{$key});
+    if (ref $attrs->{$key}
+          && exists $class->column_info($key)->{_inflate_info}) {
+      $attrs->{$key} = $class->_deflated_column($key, $attrs->{$key});
     }
   }
-  return $class->NEXT::ACTUAL::new({ %$attrs, %deflated }, @rest);
-}
-
-sub _cond_value {
-  my ($self, $attrs, $key, $value) = @_;
-  if (exists $self->_columns->{$key}) {
-    $value = $self->_deflate_column_value($key, $value);
-  }
-  return $self->NEXT::ACTUAL::_cond_value($attrs, $key, $value);
+  return $class->NEXT::ACTUAL::new($attrs, @rest);
 }
 
 1;