X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FInflateColumn.pm;h=c16375d2d2e3ff792c26c5969dd12c2eb1091b9b;hb=d2308dde5718dc0f828584c3fa24d7417c484040;hp=08b1b54b697d0175eb96773ae1574614d41c351d;hpb=e50536940adf2ebaef907a0c29ae37fbd5ce95b1;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/InflateColumn.pm b/lib/DBIx/Class/InflateColumn.pm index 08b1b54..c16375d 100644 --- a/lib/DBIx/Class/InflateColumn.pm +++ b/lib/DBIx/Class/InflateColumn.pm @@ -87,15 +87,14 @@ L sub inflate_column { my ($self, $col, $attrs) = @_; - my $colinfo = $self->result_source_instance->column_info($col); + my $colinfo = $self->result_source->columns_info([$col])->{$col}; $self->throw_exception("InflateColumn can not be used on a column with a declared FilterColumn filter") if defined $colinfo->{_filter_info} and $self->isa('DBIx::Class::FilterColumn'); - $self->throw_exception("No such column $col to inflate") - unless $self->result_source_instance->has_column($col); $self->throw_exception("inflate_column needs attr hashref") unless ref $attrs eq 'HASH'; + $colinfo->{_inflate_info} = $attrs; my $acc = $colinfo->{accessor}; $self->mk_group_accessors('inflated_column' => [ (defined $acc ? $acc : $col), $col]); @@ -111,8 +110,7 @@ sub _inflated_column { 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"); + my $info = $self->result_source->columns_info([$col])->{$col}; return $value unless exists $info->{_inflate_info}; @@ -133,8 +131,7 @@ sub _deflated_column { is_literal_value($value) ); - my $info = $self->result_source->column_info($col) or - $self->throw_exception("No column info for $col"); + my $info = $self->result_source->columns_info([$col])->{$col}; return $value unless exists $info->{_inflate_info}; @@ -160,7 +157,7 @@ sub get_inflated_column { my ($self, $col) = @_; $self->throw_exception("$col is not an inflated column") - unless exists $self->result_source->column_info($col)->{_inflate_info}; + unless exists $self->result_source->columns_info->{$col}{_inflate_info}; # we take care of keeping things in sync return $self->{_inflated_column}{$col}