X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FInflateColumn.pm;h=27bde589e874ff8d0a9fa3139a2b6cc29b431d41;hb=137dca082e1ee8a1a2649b5ca0e0707efbc21c9f;hp=d84af86b128156637105d5632a07141ea1a546e6;hpb=5ae153d7a25b664e5dc33824a7efd690ac9786b5;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/InflateColumn.pm b/lib/DBIx/Class/InflateColumn.pm
index d84af86..27bde58 100644
--- a/lib/DBIx/Class/InflateColumn.pm
+++ b/lib/DBIx/Class/InflateColumn.pm
@@ -4,7 +4,7 @@ use strict;
 use warnings;
 
 use base 'DBIx::Class::Row';
-use DBIx::Class::_Util 'is_literal_value';
+use SQL::Abstract 'is_literal_value';
 use namespace::clean;
 
 =head1 NAME
@@ -104,9 +104,14 @@ sub inflate_column {
 
 sub _inflated_column {
   my ($self, $col, $value) = @_;
-  return $value unless defined $value; # NULL is NULL is NULL
 
-  my $info = $self->column_info($col)
+  return $value if (
+    ! defined $value # NULL is NULL is NULL
+      or
+    is_literal_value($value) #that would be a not-yet-reloaded literal update
+  );
+
+  my $info = $self->result_source->column_info($col)
     or $self->throw_exception("No column info for $col");
 
   return $value unless exists $info->{_inflate_info};
@@ -128,7 +133,7 @@ sub _deflated_column {
     is_literal_value($value)
   );
 
-  my $info = $self->column_info($col) or
+  my $info = $self->result_source->column_info($col) or
     $self->throw_exception("No column info for $col");
 
   return $value unless exists $info->{_inflate_info};
@@ -155,7 +160,7 @@ sub get_inflated_column {
   my ($self, $col) = @_;
 
   $self->throw_exception("$col is not an inflated column")
-    unless exists $self->column_info($col)->{_inflate_info};
+    unless exists $self->result_source->column_info($col)->{_inflate_info};
 
   # we take care of keeping things in sync
   return $self->{_inflated_column}{$col}
@@ -163,8 +168,6 @@ sub get_inflated_column {
 
   my $val = $self->get_column($col);
 
-  return $val if is_literal_value($val);  #that would be a not-yet-reloaded literal update
-
   return $self->{_inflated_column}{$col} = $self->_inflated_column($col, $val);
 }
 
@@ -180,13 +183,19 @@ analogous to L<DBIx::Class::Row/set_column>.
 sub set_inflated_column {
   my ($self, $col, $value) = @_;
 
-  $self->set_column($col, $self->_deflated_column($col, $value));
-
-  if (length ref $value and ! is_literal_value($value) ) {
-    $self->{_inflated_column}{$col} = $value;
-  } else {
+  # pass through deflated stuff
+  if (! length ref $value or is_literal_value($value)) {
+    $self->set_column($col, $value);
     delete $self->{_inflated_column}{$col};
   }
+  # need to call set_column with the deflate cycle so that
+  # relationship caches are nuked if any
+  # also does the compare-for-dirtyness and change tracking dance
+  else {
+    $self->set_column($col, $self->_deflated_column($col, $value));
+    $self->{_inflated_column}{$col} = $value;
+  }
+
   return $value;
 }
 
@@ -202,7 +211,7 @@ as dirty. This is directly analogous to L<DBIx::Class::Row/store_column>.
 sub store_inflated_column {
   my ($self, $col, $value) = @_;
 
-  if (is_literal_value($value)) {
+  if (! length ref $value or is_literal_value($value)) {
     delete $self->{_inflated_column}{$col};
     $self->store_column($col => $value);
   }
@@ -224,19 +233,16 @@ sub store_inflated_column {
 
 =back
 
-=head1 AUTHOR
-
-Matt S. Trout <mst@shadowcatsystems.co.uk>
-
-=head1 CONTRIBUTORS
-
-Daniel Westermann-Clark <danieltwc@cpan.org> (documentation)
+=head1 FURTHER QUESTIONS?
 
-Jess Robinson <cpan@desert-island.demon.co.uk>
+Check the list of L<additional DBIC resources|DBIx::Class/GETTING HELP/SUPPORT>.
 
-=head1 LICENSE
+=head1 COPYRIGHT AND LICENSE
 
-You may distribute this code under the same terms as Perl itself.
+This module is free software L<copyright|DBIx::Class/COPYRIGHT AND LICENSE>
+by the L<DBIx::Class (DBIC) authors|DBIx::Class/AUTHORS>. You can
+redistribute it and/or modify it under the same terms as the
+L<DBIx::Class library|DBIx::Class/COPYRIGHT AND LICENSE>.
 
 =cut