X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FInflateColumn.pm;h=6b06cb091fba89f50f395efd9c955caa3c98979a;hb=237455da90aaf390eece4cce1327baaedb20db4b;hp=26a8832a622b7744b7e3e9a23db823f5d59f3f62;hpb=89279e9d0fff6fe2b90d0e3624c0349403c724f7;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/lib/DBIx/Class/InflateColumn.pm b/lib/DBIx/Class/InflateColumn.pm
index 26a8832..6b06cb0 100644
--- a/lib/DBIx/Class/InflateColumn.pm
+++ b/lib/DBIx/Class/InflateColumn.pm
@@ -2,7 +2,7 @@ package DBIx::Class::InflateColumn;
 
 use strict;
 use warnings;
-
+use Scalar::Util qw/blessed/;
 
 use base qw/DBIx::Class::Row/;
 
@@ -127,7 +127,12 @@ analogous to L<DBIx::Class::Row/set_column>.
 sub set_inflated_column {
   my ($self, $col, $obj) = @_;
   $self->set_column($col, $self->_deflated_column($col, $obj));
-  return $self->store_inflated_column($col, $obj);
+  if (blessed $obj) {
+    $self->{_inflated_column}{$col} = $obj; 
+  } else {
+    delete $self->{_inflated_column}{$col};      
+  }
+  return $obj;
 }
 
 =head2 store_inflated_column
@@ -141,6 +146,12 @@ as dirty. This is directly analogous to L<DBIx::Class::Row/store_column>.
 
 sub store_inflated_column {
   my ($self, $col, $obj) = @_;
+  unless (blessed $obj) {
+      delete $self->{_inflated_column}{$col};
+      $self->store_column($col => $obj);
+      return $obj;
+  }
+  delete $self->{_column_data}{$col};
   return $self->{_inflated_column}{$col} = $obj;
 }
 
@@ -154,7 +165,6 @@ when the method is invoked.
 
 sub get_column {
   my ($self, $col) = @_;
-  use Carp; confess unless ref $self;
   if (exists $self->{_inflated_column}{$col}
         && !exists $self->{_column_data}{$col}) {
     $self->store_column($col, $self->_deflated_column($col, $self->{_inflated_column}{$col})); 
@@ -162,17 +172,32 @@ sub get_column {
   return $self->next::method($col);
 }
 
+=head2 get_columns 
+
+Returns the get_column info for all columns as a hash,
+just like L<DBIx::Class::Row/get_columns>.  Handles inflation just
+like L</get_column>.
+
+=cut
+
 sub get_columns {
   my $self = shift;
   if (exists $self->{_inflated_column}) {
     foreach my $col (keys %{$self->{_inflated_column}}) {
-      $self->store_column($col, $self->_deflated_column($col))
+      $self->store_column($col, $self->_deflated_column($col, $self->{_inflated_column}{$col}))
        unless exists $self->{_column_data}{$col};
     }
   }
   return $self->next::method;
 }
 
+=head2 has_column_loaded
+
+Like L<DBIx::Class::Row/has_column_loaded>, but also returns true if there
+is an inflated value stored.
+
+=cut
+
 sub has_column_loaded {
   my ($self, $col) = @_;
   return 1 if exists $self->{_inflated_column}{$col};
@@ -189,7 +214,7 @@ inflation and deflation of columns appropriately.
 sub update {
   my ($class, $attrs, @rest) = @_;
   foreach my $key (keys %{$attrs||{}}) {
-    if (ref $attrs->{$key}
+    if (ref $attrs->{$key} && $class->has_column($key)
           && exists $class->column_info($key)->{_inflate_info}) {
       $class->set_inflated_column($key, delete $attrs->{$key});
     }
@@ -209,7 +234,8 @@ sub new {
   my $inflated;
   foreach my $key (keys %{$attrs||{}}) {
     $inflated->{$key} = delete $attrs->{$key} 
-      if ref $attrs->{$key} && exists $class->column_info($key)->{_inflate_info};
+      if ref $attrs->{$key} && $class->has_column($key)
+         && exists $class->column_info($key)->{_inflate_info};
   }
   my $obj = $class->next::method($attrs, @rest);
   $obj->{_inflated_column} = $inflated if $inflated;