X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FRow.pm;h=1bc569fdc216ccf874d790665936f2f8ae94c419;hb=4c9f72c1b6c90bdba16fbaa481c5eb77f73a43e6;hp=00bd0a2d5429f48678d96c8cbc24cc308c703bf3;hpb=04dac7a4cc70864592dfdb0989073c0c964788f5;p=dbsrgits%2FDBIx-Class.git diff --git a/lib/DBIx/Class/Row.pm b/lib/DBIx/Class/Row.pm index 00bd0a2..1bc569f 100644 --- a/lib/DBIx/Class/Row.pm +++ b/lib/DBIx/Class/Row.pm @@ -50,7 +50,9 @@ sub new { my ($class, $attrs) = @_; $class = ref $class if ref $class; - my $new = { _column_data => {} }; + my $new = { + _column_data => {}, + }; bless $new, $class; if (my $handle = delete $attrs->{-source_handle}) { @@ -281,9 +283,10 @@ UPDATE query to commit any changes to the object to the database if required. Also takes an options hashref of C<< column_name => value> pairs >> to update -first. But be aware that this hashref might be edited in place, so dont rely on -it being the same after a call to C. If you need to preserve the hashref, -it is sufficient to pass a shallow copy to C, e.g. ( { %{ $href } } ) +first. But be awawre that the hashref will be passed to +C, which might edit it in place, so dont rely on it being +the same after a call to C. If you need to preserve the hashref, it is +sufficient to pass a shallow copy to C, e.g. ( { %{ $href } } ) =cut @@ -294,38 +297,7 @@ sub update { $self->throw_exception("Cannot safely update a row in a PK-less table") if ! keys %$ident_cond; - if ($upd) { - foreach my $key (keys %$upd) { - if (ref $upd->{$key}) { - my $info = $self->relationship_info($key); - if ($info && $info->{attrs}{accessor} - && $info->{attrs}{accessor} eq 'single') - { - my $rel = delete $upd->{$key}; - $self->set_from_related($key => $rel); - $self->{_relationship_data}{$key} = $rel; - } elsif ($info && $info->{attrs}{accessor} - && $info->{attrs}{accessor} eq 'multi' - && ref $upd->{$key} eq 'ARRAY') { - my $others = delete $upd->{$key}; - foreach my $rel_obj (@$others) { - if(!Scalar::Util::blessed($rel_obj)) { - $rel_obj = $self->create_related($key, $rel_obj); - } - } - $self->{_relationship_data}{$key} = $others; -# $related->{$key} = $others; - next; - } - elsif ($self->has_column($key) - && exists $self->column_info($key)->{_inflate_info}) - { - $self->set_inflated_column($key, delete $upd->{$key}); - } - } - } - $self->set_columns($upd); - } + $self->set_inflated_columns($upd) if $upd; my %to_update = $self->get_dirty_columns; return $self unless keys %to_update; my $rows = $self->result_source->storage->update( @@ -352,7 +324,7 @@ usable, but C<< ->in_storage() >> will now return 0 and the object must reinserted using C<< ->insert() >> before C<< ->update() >> can be used on it. If you delete an object in a class with a C relationship, all the related objects will be deleted as well. To turn -this behavior off, pass C 0> in the C<$attr> +this behavior off, pass C<< cascade_delete => 0 >> in the C<$attr> hashref. Any database-level cascade or restrict will take precedence over a DBIx-Class-based cascading delete. See also L. @@ -488,7 +460,11 @@ sub set_column { my $old = $self->get_column($column); my $ret = $self->store_column(@_); $self->{_dirty_columns}{$column} = 1 - if (defined $old ^ defined $ret) || (defined $old && $old ne $ret); + if (defined $old xor defined $ret) || (defined $old && $old ne $ret); + + # XXX clear out the relation cache for this column + delete $self->{related_resultsets}{$column}; + return $ret; } @@ -508,6 +484,52 @@ sub set_columns { return $self; } +=head2 set_inflated_columns + + my $copy = $orig->set_inflated_columns({ $col => $val, $rel => $obj, ... }); + +Sets more than one column value at once, taking care to respect inflations and +relationships if relevant. Be aware that this hashref might be edited in place, +so dont rely on it being the same after a call to C. If +you need to preserve the hashref, it is sufficient to pass a shallow copy to +C, e.g. ( { %{ $href } } ) + +=cut + +sub set_inflated_columns { + my ( $self, $upd ) = @_; + foreach my $key (keys %$upd) { + if (ref $upd->{$key}) { + my $info = $self->relationship_info($key); + if ($info && $info->{attrs}{accessor} + && $info->{attrs}{accessor} eq 'single') + { + my $rel = delete $upd->{$key}; + $self->set_from_related($key => $rel); + $self->{_relationship_data}{$key} = $rel; + } elsif ($info && $info->{attrs}{accessor} + && $info->{attrs}{accessor} eq 'multi' + && ref $upd->{$key} eq 'ARRAY') { + my $others = delete $upd->{$key}; + foreach my $rel_obj (@$others) { + if(!Scalar::Util::blessed($rel_obj)) { + $rel_obj = $self->create_related($key, $rel_obj); + } + } + $self->{_relationship_data}{$key} = $others; +# $related->{$key} = $others; + next; + } + elsif ($self->has_column($key) + && exists $self->column_info($key)->{_inflate_info}) + { + $self->set_inflated_column($key, delete $upd->{$key}); + } + } + } + $self->set_columns($upd); +} + =head2 copy my $copy = $orig->copy({ change => $to, ... }); @@ -529,7 +551,7 @@ sub copy { bless $new, ref $self; $new->result_source($self->result_source); - $new->set_columns($changes); + $new->set_inflated_columns($changes); $new->insert; # Its possible we'll have 2 relations to the same Source. We need to make @@ -748,6 +770,22 @@ sub throw_exception { } } +=head2 id + +Returns the primary key(s) for a row. Can't be called as a class method. +Actually implemented in L + +=head2 discard_changes + +Re-selects the row from the database, losing any changes that had +been made. + +This method can also be used to refresh from storage, retrieving any +changes made since the row was last read from storage. Actually +implemented in L + +=cut + 1; =head1 AUTHORS