X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FFilterColumn.pm;h=222dabd374eb711eef2733e01775046d9d360e28;hb=b5ce6748f58040ca877fd05e8f004b14d46b2ba9;hp=9ae5007913d3906e542c5fbaafd295eec1e8d9dd;hpb=9b2c0de65a57ab32a0a18293ad49fa30f70fee31;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/FilterColumn.pm b/lib/DBIx/Class/FilterColumn.pm index 9ae5007..222dabd 100644 --- a/lib/DBIx/Class/FilterColumn.pm +++ b/lib/DBIx/Class/FilterColumn.pm @@ -2,19 +2,29 @@ package DBIx::Class::FilterColumn; use strict; use warnings; -use base qw/DBIx::Class::Row/; +use base 'DBIx::Class::Row'; +use SQL::Abstract 'is_literal_value'; +use namespace::clean; sub filter_column { my ($self, $col, $attrs) = @_; + my $colinfo = $self->column_info($col); + + $self->throw_exception("FilterColumn can not be used on a column with a declared InflateColumn inflator") + if defined $colinfo->{_inflate_info} and $self->isa('DBIx::Class::InflateColumn'); + $self->throw_exception("No such column $col to filter") unless $self->has_column($col); - $self->throw_exception("filter_column needs attr hashref") + $self->throw_exception('filter_column expects a hashref of filter specifications') unless ref $attrs eq 'HASH'; - $self->column_info($col)->{_filter_info} = $attrs; - my $acc = $self->column_info($col)->{accessor}; + $self->throw_exception('An invocation of filter_column() must specify either a filter_from_storage or filter_to_storage') + unless $attrs->{filter_from_storage} || $attrs->{filter_to_storage}; + + $colinfo->{_filter_info} = $attrs; + my $acc = $colinfo->{accessor}; $self->mk_group_accessors(filtered_column => [ (defined $acc ? $acc : $col), $col]); return 1; } @@ -22,7 +32,7 @@ sub filter_column { sub _column_from_storage { my ($self, $col, $value) = @_; - return $value unless defined $value; + return $value if is_literal_value($value); my $info = $self->column_info($col) or $self->throw_exception("No column info for $col"); @@ -30,22 +40,23 @@ sub _column_from_storage { return $value unless exists $info->{_filter_info}; my $filter = $info->{_filter_info}{filter_from_storage}; - $self->throw_exception("No inflator for $col") unless defined $filter; - return $self->$filter($value); + return defined $filter ? $self->$filter($value) : $value; } sub _column_to_storage { my ($self, $col, $value) = @_; + return $value if is_literal_value($value); + my $info = $self->column_info($col) or $self->throw_exception("No column info for $col"); return $value unless exists $info->{_filter_info}; my $unfilter = $info->{_filter_info}{filter_to_storage}; - $self->throw_exception("No unfilter for $col") unless defined $unfilter; - return $self->$unfilter($value); + + return defined $unfilter ? $self->$unfilter($value) : $value; } sub get_filtered_column { @@ -59,45 +70,108 @@ sub get_filtered_column { my $val = $self->get_column($col); - return $self->{_filtered_column}{$col} = $self->_column_from_storage($col, $val); + return $self->{_filtered_column}{$col} = $self->_column_from_storage( + $col, $val + ); } -sub set_filtered_column { - my ($self, $col, $filtered) = @_; +sub get_column { + my ($self, $col) = @_; - $self->set_column($col, $self->_column_to_storage($col, $filtered)); + if (exists $self->{_filtered_column}{$col}) { + return $self->{_column_data}{$col} ||= $self->_column_to_storage ( + $col, $self->{_filtered_column}{$col} + ); + } + return $self->next::method ($col); +} + +# sadly a separate codepath in Row.pm ( used by insert() ) +sub get_columns { + my $self = shift; + + $self->{_column_data}{$_} = $self->_column_to_storage ( + $_, $self->{_filtered_column}{$_} + ) for grep + { ! exists $self->{_column_data}{$_} } + keys %{$self->{_filtered_column}||{}} + ; + + $self->next::method (@_); +} + +sub store_column { + my ($self, $col) = (shift, @_); + + # blow cache delete $self->{_filtered_column}{$col}; - return $filtered; + $self->next::method(@_); +} + +sub has_column_loaded { + my ($self, $col) = @_; + return 1 if exists $self->{_filtered_column}{$col}; + return $self->next::method($col); +} + +sub set_filtered_column { + my ($self, $col, $filtered) = @_; + + # unlike IC, FC does not need to deal with the 'filter' abomination + # thus we can short-curcuit filtering entirely and never call set_column + # in case this is already a dirty change OR the row never touched storage + if ( + ! $self->in_storage + or + $self->is_column_changed($col) + ) { + $self->make_column_dirty($col); + delete $self->{_column_data}{$col}; + } + else { + $self->set_column($col, $self->_column_to_storage($col, $filtered)); + }; + + return $self->{_filtered_column}{$col} = $filtered; } sub update { - my ($self, $attrs, @rest) = @_; - foreach my $key (keys %{$attrs||{}}) { - if ($self->has_column($key) && - exists $self->column_info($key)->{_filter_info}) { - my $val = delete $attrs->{$key}; - $self->set_filtered_column($key, $val); - $attrs->{$key} = $self->_column_to_storage($key, $val) + my ($self, $data, @rest) = @_; + + foreach my $col (keys %{$data||{}}) { + if ( + $self->has_column($col) + && + exists $self->column_info($col)->{_filter_info} + ) { + $self->set_filtered_column($col, delete $data->{$col}); + + # FIXME update() reaches directly into the object-hash + # and we may *not* have a filtered value there - thus + # the void-ctx filter-trigger + $self->get_column($col) unless exists $self->{_column_data}{$col}; } } - return $self->next::method($attrs, @rest); + + return $self->next::method($data, @rest); } sub new { - my ($class, $attrs, @rest) = @_; - my $source = $attrs->{-result_source} + my ($class, $data, @rest) = @_; + my $source = $data->{-result_source} or $class->throw_exception('Sourceless rows are not supported with DBIx::Class::FilterColumn'); - my $obj = $class->next::method($attrs, @rest); - foreach my $key (keys %{$attrs||{}}) { - if ($obj->has_column($key) && - exists $obj->column_info($key)->{_filter_info} ) { - my $val = delete $attrs->{$key}; - $obj->set_filtered_column($key, $val); + my $obj = $class->next::method($data, @rest); + + foreach my $col (keys %{$data||{}}) { + if ($obj->has_column($col) && + exists $obj->column_info($col)->{_filter_info} ) { + $obj->set_filtered_column($col, $data->{$col}); } } + return $obj; } @@ -109,7 +183,12 @@ DBIx::Class::FilterColumn - Automatically convert column data =head1 SYNOPSIS - # In your result classes +In your Schema or DB class add "FilterColumn" to the top of the component list. + + __PACKAGE__->load_components(qw( FilterColumn ... )); + +Set up filters for the columns you want to convert. + __PACKAGE__->filter_column( money => { filter_to_storage => 'to_pennies', filter_from_storage => 'from_pennies', @@ -121,6 +200,7 @@ DBIx::Class::FilterColumn - Automatically convert column data 1; + =head1 DESCRIPTION This component is meant to be a more powerful, but less DWIM-y, @@ -133,15 +213,23 @@ be done with L can be done with this component. =head2 filter_column __PACKAGE__->filter_column( colname => { - filter_from_storage => 'method', - filter_to_storage => 'method', + filter_from_storage => 'method'|\&coderef, + filter_to_storage => 'method'|\&coderef, }) -This is the method that you need to call to set up a filtered column. It takes -exactly two arguments; the first being the column name the second being a -C with C and C having -something that can be called as a method. The method will be called with -the value of the column as the first non-C<$self> argument. +This is the method that you need to call to set up a filtered column. It takes +exactly two arguments; the first being the column name the second being a hash +reference with C and C set to either +a method name or a code reference. In either case the filter is invoked as: + + $result->$filter_specification ($value_to_filter) + +with C<$filter_specification> being chosen depending on whether the +C<$value_to_filter> is being retrieved from or written to permanent +storage. + +If a specific directional filter is not specified, the original value will be +passed to/from storage unfiltered. =head2 get_filtered_column @@ -155,10 +243,21 @@ Returns the filtered value of the column Sets the filtered value of the column -=head2 update +=head1 EXAMPLE OF USE + +Some databases have restrictions on values that can be passed to +boolean columns, and problems can be caused by passing value that +perl considers to be false (such as C). -Just overridden to filter changed columns through this component +One solution to this is to ensure that the boolean values are set +to something that the database can handle - such as numeric zero +and one, using code like this:- -=head2 new + __PACKAGE__->filter_column( + my_boolean_column => { + filter_to_storage => sub { $_[1] ? 1 : 0 }, + } + ); -Just overridden to filter columns through this component +In this case the C is not required, as just +passing the database value through to perl does the right thing.