From: Jess Robinson Date: Mon, 1 Jan 2007 19:59:21 +0000 (+0000) Subject: Inflate/Deflate on all refs but scalars, with tests and all! X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=e81a62410d9b030620169dc317c82f87c1e823bf;p=dbsrgits%2FDBIx-Class-Historic.git Inflate/Deflate on all refs but scalars, with tests and all! --- diff --git a/lib/DBIx/Class/InflateColumn.pm b/lib/DBIx/Class/InflateColumn.pm index 6b06cb0..d9ad0e0 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 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}; @@ -260,6 +267,8 @@ Matt S. Trout Daniel Westermann-Clark (documentation) +Jess Robinson + =head1 LICENSE You may distribute this code under the same terms as Perl itself. diff --git a/t/68inflate.t b/t/68inflate.t index 0ce901c..cc444a0 100644 --- a/t/68inflate.t +++ b/t/68inflate.t @@ -11,7 +11,7 @@ my $schema = DBICTest->init_schema(); eval { require DateTime }; plan skip_all => "Need DateTime for inflation tests" if $@; -plan tests => 4; +plan tests => 15; DBICTest::Schema::CD->inflate_column( 'year', { inflate => sub { DateTime->new( year => shift ) }, @@ -28,6 +28,21 @@ is( $cd->year->year, 1997, 'inflated year ok' ); is( $cd->year->month, 1, 'inflated month ok' ); +eval { $cd->year(\'year +1'); }; +ok(!$@, 'updated year using a scalarref'); +$cd->update(); +$cd->discard_changes(); + +is( ref($cd->year), 'DateTime', 'year is still a DateTime, ok' ); + +is( $cd->year->year, 1998, 'updated year, bypassing inflation' ); + +is( $cd->year->month, 1, 'month is still 1' ); + +# get_inflated_column test + +is( ref($cd->get_inflated_column('year')), 'DateTime', 'get_inflated_column produces a DateTime'); + # deflate test my $now = DateTime->now; $cd->year( $now ); @@ -36,3 +51,33 @@ $cd->update; ($cd) = $schema->resultset("CD")->search( year => $now->year ); is( $cd->year->year, $now->year, 'deflate ok' ); +# set_inflated_column test +eval { $cd->set_inflated_column('year', $now) }; +ok(!$@, 'set_inflated_column with DateTime object'); +$cd->update; + +($cd) = $schema->resultset("CD")->search( year => $now->year ); +is( $cd->year->year, $now->year, 'deflate ok' ); + +eval { $cd->set_inflated_column('year', \'year + 1') }; +print STDERR "ERROR: $@" if($@); +ok(!$@, 'set_inflated_column to "year + 1"'); +$cd->update; +$cd->discard_changes(); + +($cd) = $schema->resultset("CD")->search( year => $now->year + 1 ); +is( $cd->year->year, $now->year+1, 'deflate ok' ); + +# store_inflated_column test +eval { $cd->store_inflated_column('year', $now) }; +ok(!$@, 'store_inflated_column with DateTime object'); +$cd->update; + +is( $cd->year->year, $now->year, 'deflate ok' ); + +# eval { $cd->store_inflated_column('year', \'year + 1') }; +# print STDERR "ERROR: $@" if($@); +# ok(!$@, 'store_inflated_column to "year + 1"'); + +# is_deeply( $cd->year, \'year + 1', 'deflate ok' ); + diff --git a/t/68inflate_serialize.t b/t/68inflate_serialize.t index 5eed843..2efabbf 100644 --- a/t/68inflate_serialize.t +++ b/t/68inflate_serialize.t @@ -32,7 +32,7 @@ foreach my $serializer (@serializers) { plan (skip_all => "No suitable serializer found") unless $selected; -plan (tests => 6); +plan (tests => 8); DBICTest::Schema::Serialized->inflate_column( 'serialized', { inflate => $selected->{inflater}, deflate => $selected->{deflater}, @@ -69,6 +69,13 @@ ok($entry->update ({ %{$complex1} }), 'hashref deflation ok'); ok($inflated = $entry->serialized, 'hashref inflation ok'); is_deeply($inflated, $complex1->{serialized}, 'inflated hash matches original'); +my $entry2 = $rs->create({ id => 2, serialized => ''}); + +eval { $entry2->set_inflated_column('serialized', $complex1->{serialized}) }; +ok(!$@, 'set_inflated_column to a hashref'); +$entry2->update; +is_deeply($entry2->serialized, $complex1->{serialized}, 'inflated hash matches original'); + ok($entry->update ({ %{$complex2} }), 'arrayref deflation ok'); ok($inflated = $entry->serialized, 'arrayref inflation ok'); is_deeply($inflated, $complex2->{serialized}, 'inflated array matches original');