X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FInflateColumn.pm;h=84f86b89a37f425778e1652e49a5a500b2d3ef5f;hb=787d6a29691dc69dcfac4d084c3422de54bc1ce8;hp=d5791cb600c5f70b47756f120c80000932e23d6d;hpb=c5cf11f1e582b7380a6a91b29cf3ba0b26fcaea0;p=dbsrgits%2FDBIx-Class.git

diff --git a/lib/DBIx/Class/InflateColumn.pm b/lib/DBIx/Class/InflateColumn.pm
index d5791cb..84f86b8 100644
--- a/lib/DBIx/Class/InflateColumn.pm
+++ b/lib/DBIx/Class/InflateColumn.pm
@@ -8,7 +8,7 @@ use base qw/DBIx::Class::Row/;
 
 =head1 NAME
 
-DBIx::Class::InflateColumn - Automatically create objects from column data
+DBIx::Class::InflateColumn - Automatically create references from column data
 
 =head1 SYNOPSIS
 
@@ -20,13 +20,18 @@ DBIx::Class::InflateColumn - Automatically create objects from column data
 
 =head1 DESCRIPTION
 
-This component translates column data into objects, i.e. "inflating"
-the column data. It also "deflates" objects into an appropriate format
+This component translates column data into references, i.e. "inflating"
+the column data. It also "deflates" references into an appropriate format
 for the database.
 
 It can be used, for example, to automatically convert to and from
 L<DateTime> objects for your date and time fields.
 
+It will accept arrayrefs, hashrefs and blessed references (objects),
+but not scalarrefs. Scalar references are passed through to the
+database to deal with, to allow such settings as C< \'year + 1'> and
+C< \'DEFAULT' > to work.
+
 =head1 METHODS
 
 =head2 inflate_column
@@ -85,7 +90,9 @@ sub _inflated_column {
 
 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 ref $value && blessed($value); # If it's not an object, don't touch it
+  ## Leave scalar refs (ala SQL::Abstract literal SQL), untouched, deflate all other refs
+  return $value unless (ref $value && ref($value) ne 'SCALAR');
   my $info = $self->column_info($col) or
     $self->throw_exception("No column info for $col");
   return $value unless exists $info->{_inflate_info};
@@ -125,14 +132,15 @@ analogous to L<DBIx::Class::Row/set_column>.
 =cut
 
 sub set_inflated_column {
-  my ($self, $col, $obj) = @_;
-  $self->set_column($col, $self->_deflated_column($col, $obj));
-  if (blessed $obj) {
-    $self->{_inflated_column}{$col} = $obj; 
+  my ($self, $col, $inflated) = @_;
+  $self->set_column($col, $self->_deflated_column($col, $inflated));
+#  if (blessed $inflated) {
+  if (ref $inflated && ref($inflated) ne 'SCALAR') {
+    $self->{_inflated_column}{$col} = $inflated; 
   } else {
     delete $self->{_inflated_column}{$col};      
   }
-  return $obj;
+  return $inflated;
 }
 
 =head2 store_inflated_column
@@ -145,14 +153,15 @@ as dirty. This is directly analogous to L<DBIx::Class::Row/store_column>.
 =cut
 
 sub store_inflated_column {
-  my ($self, $col, $obj) = @_;
-  unless (blessed $obj) {
+  my ($self, $col, $inflated) = @_;
+#  unless (blessed $inflated) {
+  unless (ref $inflated && ref($inflated) ne 'SCALAR') {
       delete $self->{_inflated_column}{$col};
-      $self->store_column($col => $obj);
-      return $obj;
+      $self->store_column($col => $inflated);
+      return $inflated;
   }
   delete $self->{_column_data}{$col};
-  return $self->{_inflated_column}{$col} = $obj;
+  return $self->{_inflated_column}{$col} = $inflated;
 }
 
 =head2 get_column
@@ -172,6 +181,14 @@ 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}) {
@@ -183,6 +200,13 @@ sub get_columns {
   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};
@@ -199,7 +223,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});
     }
@@ -219,7 +243,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;
@@ -244,6 +269,8 @@ Matt S. Trout <mst@shadowcatsystems.co.uk>
 
 Daniel Westermann-Clark <danieltwc@cpan.org> (documentation)
 
+Jess Robinson <cpan@desert-island.demon.co.uk>
+
 =head1 LICENSE
 
 You may distribute this code under the same terms as Perl itself.