X-Git-Url: https://git.dogcows.com/gitweb?p=chaz%2Fp5-DBIx-Class-ResultSet-RecursiveUpdate;a=blobdiff_plain;f=lib%2FDBIx%2FClass%2FResultSet%2FRecursiveUpdate.pm;h=fcbad3bbf816ea9fe858d1b83d3343dbaa2079dd;hp=8992718ae78e52bbe1af5818093d2b182bce6e8d;hb=454db15e55f697bb4c64b52d1d9403a30361bede;hpb=d5e0c363032486e064fe5cf4fba61153060c65f9 diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm index 8992718..fcbad3b 100644 --- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm +++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm @@ -2,7 +2,7 @@ use strict; use warnings; package DBIx::Class::ResultSet::RecursiveUpdate; -use version; our $VERSION = qv('0.005'); +use version; our $VERSION = qv('0.008'); use base qw(DBIx::Class::ResultSet); @@ -22,7 +22,8 @@ use Scalar::Util qw( blessed ); sub recursive_update { my %params = @_; - my ( $self, $updates, $fixed_fields, $object ) = @params{ qw/resultset updates fixed_fields object/ }; + my ( $self, $updates, $fixed_fields, $object, $resolved ) = @params{ qw/resultset updates fixed_fields object resolved/ }; + $resolved ||= {}; # warn 'entering: ' . $self->result_source->from(); carp 'fixed fields needs to be an array ref' if $fixed_fields && ref($fixed_fields) ne 'ARRAY'; my %fixed_fields; @@ -30,6 +31,21 @@ sub recursive_update { if ( blessed($updates) && $updates->isa('DBIx::Class::Row') ) { return $updates; } + if ( $updates->{id} ){ + $object = $self->find( $updates->{id}, { key => 'primary' } ); + } + my @missing = + grep { !exists $updates->{$_} && !exists $fixed_fields{$_} } $self->result_source->primary_columns; + if ( !$object && !scalar @missing ) { + $object = $self->find( $updates, { key => 'primary' } ); + } + @missing = + grep { !exists $resolved->{$_} } @missing; + if ( !$object && !scalar @missing ) { + $object = $self->find( \%{ %$updates, %$resolved }, { key => 'primary' } ); + } + $object ||= $self->new( {} ); + # warn Dumper( $updates ); use Data::Dumper; # direct column accessors my %columns; @@ -42,7 +58,10 @@ sub recursive_update { my %post_updates; my %other_methods; my %columns_by_accessor = _get_columns_by_accessor( $self ); - +# warn 'resolved: ' . Dumper( $resolved ); + $updates = { %$updates, %$resolved }; +# warn 'updates: ' . Dumper( $updates ); use Data::Dumper; +# warn 'columns: ' . Dumper( \%columns_by_accessor ); for my $name ( keys %$updates ) { my $source = $self->result_source; if ( $columns_by_accessor{$name} @@ -52,10 +71,10 @@ sub recursive_update { $columns{$name} = $updates->{$name}; next; } - if( !( $source->has_relationship($name) && ref( $updates->{$name} ) ) ){ + if( !( $source->has_relationship($name) ) ){ $other_methods{$name} = $updates->{$name}; + next; } - next if !$source->has_relationship($name); my $info = $source->relationship_info($name); if ( _master_relation_cond( @@ -69,18 +88,11 @@ sub recursive_update { $post_updates{$name} = $updates->{$name}; } } - # warn 'columns: ' . Dumper( \%columns ); use Data::Dumper; - - my @missing = - grep { !exists $columns{$_} && !exists $fixed_fields{$_} } $self->result_source->primary_columns; - if ( !$object && !scalar @missing ) { - $object = $self->find( \%columns, { key => 'primary' } ); - } - $object ||= $self->new( {} ); + # warn 'other: ' . Dumper( \%other_methods ); use Data::Dumper; # first update columns and other accessors - so that later related records can be found for my $name ( keys %columns ) { - $object->$name( $updates->{$name} ); + $object->$name( $columns{$name} ); } for my $name ( keys %other_methods) { $object->$name( $updates->{$name} ) if $object->can( $name ); @@ -92,8 +104,10 @@ sub recursive_update { # $self->_delete_empty_auto_increment($object); # don't allow insert to recurse to related objects - we do the recursion ourselves # $object->{_rel_in_storage} = 1; + $object->update_or_insert; + # updating many_to_many for my $name ( keys %$updates ) { next if exists $columns{$name}; @@ -103,7 +117,17 @@ sub recursive_update { my ($pk) = _get_pk_for_related( $self, $name); my @rows; my $result_source = $object->$name->result_source; - for my $elem ( @{ $updates->{$name} } ) { + my @updates; + if( ! defined $value ){ + next; + } + elsif( ref $value ){ + @updates = @{ $value }; + } + else{ + @updates = ( $value ); + } + for my $elem ( @updates ) { if ( ref $elem ) { push @rows, $result_source->resultset->find($elem); } @@ -139,34 +163,43 @@ sub _update_relation { my ( $self, $name, $updates, $object, $info ) = @_; my $related_result = $self->related_resultset($name)->result_source->resultset; - my $resolved = - $self->result_source->resolve_condition( $info->{cond}, $name, $object ); + my $resolved; + if( $self->result_source->can( '_resolve_condition' ) ){ + $resolved = $self->result_source->_resolve_condition( $info->{cond}, $name, $object ); + } + else{ + $resolved = $self->result_source->resolve_condition( $info->{cond}, $name, $object ); + } # warn 'resolved: ' . Dumper( $resolved ); use Data::Dumper; - $resolved = undef + $resolved = {} if defined $DBIx::Class::ResultSource::UNRESOLVABLE_CONDITION && $DBIx::Class::ResultSource::UNRESOLVABLE_CONDITION == $resolved; if ( ref $updates->{$name} eq 'ARRAY' ) { for my $sub_updates ( @{ $updates->{$name} } ) { - $sub_updates = { %$sub_updates, %$resolved } if $resolved && ref( $sub_updates ) eq 'HASH'; my $sub_object = - recursive_update( resultset => $related_result, updates => $sub_updates ); + recursive_update( resultset => $related_result, updates => $sub_updates, resolved => $resolved ); } } else { my $sub_updates = $updates->{$name}; - $sub_updates = { %$sub_updates, %$resolved } if $resolved && ref( $sub_updates ) eq 'HASH'; my $sub_object; - if( $info->{attrs}{accessor} eq 'single' && defined $object->$name ){ - $sub_object = recursive_update( - resultset => $related_result, - updates => $sub_updates, - object => $object->$name - ); + if( ref $sub_updates ){ + # for might_have relationship + if( $info->{attrs}{accessor} eq 'single' && defined $object->$name ){ + $sub_object = recursive_update( + resultset => $related_result, + updates => $sub_updates, + object => $object->$name + ); + } + else{ + $sub_object = + recursive_update( resultset => $related_result, updates => $sub_updates, resolved => $resolved ); + } + } + elsif( ! ref $sub_updates ){ + $sub_object = $related_result->find( $sub_updates ); } - else{ - $sub_object = - recursive_update( resultset => $related_result, updates => $sub_updates ); - } $object->set_from_related( $name, $sub_object ); } } @@ -269,7 +302,7 @@ DBIx::Class::ResultSet::RecursiveUpdate - like update_or_create - but recursive =head1 VERSION -This document describes DBIx::Class::ResultSet::RecursiveUpdate version 0.004 +This document describes DBIx::Class::ResultSet::RecursiveUpdate version 0.006 =head1 SYNOPSIS @@ -277,14 +310,16 @@ This document describes DBIx::Class::ResultSet::RecursiveUpdate version 0.004 The functional interface: my $new_item = DBIx::Class::ResultSet::RecursiveUpdate::Functions::recursive_update({ - id => 1, - owned_dvds => [ - { - title => 'One Flew Over the Cuckoo's Nest' - } - ] - } - ); + resultset => $schema->resultset( 'Dvd' ), + updates => { + id => 1, + owned_dvds => [ + { + title => 'One Flew Over the Cuckoo's Nest' + } + ] + } + }); As ResultSet subclass: