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=43e8d89561a18d54d4f5a473bfabb94712182698;hp=95725d0a5b9764ab58ebc5642092ccfe6d94c009;hb=d93b1239cb7de482ac79a091d7daa67115596306;hpb=ecf081dd43f887e5a7458601f636ae9e5e8c5832

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index 95725d0..43e8d89 100644
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -11,60 +11,66 @@ use base qw(DBIx::Class::ResultSet);
 
 sub recursive_update { 
     my( $self, $updates, $fixed_fields ) = @_;
+    # warn 'entering: ' . $self->result_source->from();
     if( blessed( $updates ) && $updates->isa( 'DBIx::Class::Row' ) ){
         return $updates;
     }
-    my $object;
-#    warn 'cond: ' . Dumper( $self->{cond} ); use Data::Dumper;
-#    warn 'where: ' . Dumper( $self->{attrs}{where} ); use Data::Dumper;
-    my @missing = grep { !exists $updates->{$_} && !exists $fixed_fields->{$_} } $self->result_source->primary_columns;
-    if( defined $self->{cond} && $DBIx::Class::ResultSource::UNRESOLVABLE_CONDITION == $self->{cond} ){
-        $self->{cond} = undef;
-        $self->{attrs}{where} = undef;
-        if( ! scalar @missing ){
-            $object = $self->find( $updates, { key => 'primary' } );
+    if( $fixed_fields ){
+        carp if !( ref( $fixed_fields ) eq 'HASH' );
+        $updates = { %$updates, %$fixed_fields };
+    }
+    # direct column accessors
+    my %columns;
+    
+    # relations that that should be done before the row is inserted into the database
+    # like belongs_to
+    my %pre_updates;
+    
+    # relations that that should be done after the row is inserted into the database
+    # like has_many and might_have
+    my %post_updates;
+    for my $name ( keys %$updates ){
+        my $source = $self->result_source;
+        if( $source->has_column($name) 
+            && !( $source->has_relationship($name) && ref( $updates->{$name} ) ) 
+        ){
+            $columns{$name} = $updates->{$name};
+            next;
+        }
+        next if ! $source->has_relationship($name);
+        my $info = $source->relationship_info( $name );
+        if( _master_relation_cond( $source, $info->{cond}, $self->_get_pk_for_related( $name ) ) ){
+            $pre_updates{$name} = $updates->{$name};
+        }
+        else{
+            $post_updates{$name} = $updates->{$name};
         }
     }
-    else{
-        $object = $self->find( $updates, { key => 'primary' } );
+    # warn 'columns: ' . Dumper( \%columns ); use Data::Dumper;
+    
+    my $object;
+    my @missing = grep { !exists $columns{$_} } $self->result_source->primary_columns;
+    if( ! scalar @missing ){
+        $object = $self->find( \%columns, { key => 'primary' } );
     }
     $object ||= $self->new( {} );
 
     # first update columns and other accessors - so that later related records can be found
-    for my $name ( keys %$updates ){ 
-        if( $self->is_for_column( $object, $name, $updates->{$name} ) ) {
-            $object->$name( $updates->{$name} );
-        }
+    for my $name ( keys %columns ){ 
+        $object->$name( $updates->{$name} );
     }
-    for my $name ( keys %$updates ){ 
-        if($object->can($name) && !$self->is_for_column( $object, $name, $updates->{$name} ) ){
-
-            # updating relations that that should be done before the row is inserted into the database
-            # like belongs_to
-                my $info = $object->result_source->relationship_info( $name );
-                if( $info and not $info->{attrs}{accessor} eq 'multi'
-                        and 
-                    _master_relation_cond( $object, $info->{cond}, $self->_get_pk_for_related( $name ) )
-                ){
-                    my $related_result = $object->related_resultset( $name );
-                    my $resolved =  $self->result_source->resolve_condition(
-                        $info->{cond}, $name, $object
-                    );
-#                    warn 'resolved: ' . Dumper( $resolved ); use Data::Dumper;
-                    my $sub_object = $related_result->recursive_update( $updates->{$name} );
-                    $object->set_from_related( $name, $sub_object );
-                }
-        }
+    for my $name ( keys %pre_updates ){ 
+        my $info = $object->result_source->relationship_info( $name );
+        $self->update_relation( $name, $updates, $object, $info );
     }
     $self->_delete_empty_auto_increment($object);
-    # don't allow insert to recurse to related objects - we do the recursion ourselves
+# don't allow insert to recurse to related objects - we do the recursion ourselves
 #    $object->{_rel_in_storage} = 1;
-#    warn Dumper( $object->{_column_data} );
     $object->update_or_insert;
 
-    # updating relations that can be done only after the row is inserted into the database
-    # like has_many and many_to_many
+    # updating many_to_many
     for my $name ( keys %$updates ){
+        next if exists $columns{ $name };
         my $value = $updates->{$name};
         # many to many case
         if( $self->is_m2m( $name ) ) {
@@ -82,38 +88,35 @@ sub recursive_update {
                 my $set_meth = 'set_' . $name;
                 $object->$set_meth( \@rows );
         }
-        elsif( $object->result_source->has_relationship($name) ){
-            my $info = $object->result_source->relationship_info( $name );
-            # has many case (and similar)
-            if( ref $updates->{$name} eq 'ARRAY' ){
-                for my $sub_updates ( @{$updates->{$name}} ) {
-                    my $sub_object = $object->search_related( $name )->recursive_update( $sub_updates );
-                }
-            }
-            # might_have and has_one case
-            elsif ( ! _master_relation_cond( $object, $info->{cond}, $self->_get_pk_for_related( $name ) ) ){
-                my $sub_object = $object->search_related( $name )->recursive_update( $value );
-                #$object->set_from_related( $name, $sub_object );
-            }
-        }
+    }
+    for my $name ( keys %post_updates ){ 
+        my $info = $object->result_source->relationship_info( $name );
+        $self->update_relation( $name, $updates, $object, $info );
     }
     return $object;
 }
 
-sub is_for_column { 
-    my( $self, $object, $name, $value ) = @_;
-    return 
-    $object->can($name)
-    && !( 
-        $object->result_source->has_relationship($name)
-        && ref( $value )
-    )
-    && ( 
-        $object->result_source->has_column($name)
-        || !$object->can( 'set_' . $name )
-    )
+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
+                    );
+#                    warn 'resolved: ' . Dumper( $resolved ); use Data::Dumper;
+                    $resolved = undef if $DBIx::Class::ResultSource::UNRESOLVABLE_CONDITION == $resolved;
+                    if( ref $updates->{$name} eq 'ARRAY' ){
+                        for my $sub_updates ( @{$updates->{$name}} ) {
+                            my $sub_object = $related_result->recursive_update( $sub_updates, $resolved );
+                        }
+                    }
+                    else { 
+                        my $sub_object = $related_result->recursive_update( $updates->{$name}, $resolved );
+                        $object->set_from_related( $name, $sub_object );
+                    }
 }
 
+
 sub is_m2m {
     my( $self, $relation ) = @_;
     my $rclass = $self->result_class;
@@ -164,7 +167,6 @@ sub _delete_empty_auto_increment {
 
 sub _get_pk_for_related {
     my ( $self, $relation ) = @_;
-
     my $result_source;
     if( $self->result_source->has_relationship( $relation ) ){
         $result_source = $self->result_source->related_source( $relation );
@@ -177,14 +179,14 @@ sub _get_pk_for_related {
 }
 
 sub _master_relation_cond {
-    my ( $object, $cond, @foreign_ids ) = @_;
+    my ( $source, $cond, @foreign_ids ) = @_;
     my $foreign_ids_re = join '|', @foreign_ids;
     if ( ref $cond eq 'HASH' ){
         for my $f_key ( keys %{$cond} ) {
             # might_have is not master
             my $col = $cond->{$f_key};
             $col =~ s/self\.//;
-            if( $object->column_info( $col )->{is_auto_increment} ){
+            if( $source->column_info( $col )->{is_auto_increment} ){
                 return 0;
             }
             if( $f_key =~ /^foreign\.$foreign_ids_re/ ){
@@ -193,13 +195,12 @@ sub _master_relation_cond {
         }
     }elsif ( ref $cond eq 'ARRAY' ){
         for my $new_cond ( @$cond ) {
-            return 1 if _master_relation_cond( $object, $new_cond, @foreign_ids );
+            return 1 if _master_relation_cond( $source, $new_cond, @foreign_ids );
         }
     }
     return;
 }
 
-
 1; # Magic true value required at end of module
 __END__