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=68532cec049946cd480633730994e0d0dfee7f9b;hp=dcf370752d16a4fa47ac39fbf3c9d11524eff0ec;hb=305abeadc52a6b04637ecf4ad6c57b15979a671e;hpb=b7b1b75e38ba3bb4ba50c76c33610b725167ed41

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index dcf3707..68532ce 100644
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -20,6 +20,7 @@ sub recursive_update {
 package DBIx::Class::ResultSet::RecursiveUpdate::Functions;
 use Carp;
 use Scalar::Util qw( blessed );
+use List::MoreUtils qw/ any /;
 
 sub recursive_update {
     my %params = @_;
@@ -84,28 +85,22 @@ sub recursive_update {
                 && ref( $updates->{$name} ) ) )
         {
 
-            #warn "$name is a column";
+            #warn "$name is a column\n";
             $columns{$name} = $updates->{$name};
             next;
         }
 
         # relationships
         if ( $source->has_relationship($name) ) {
-            my $info = $source->relationship_info($name);
-            if (_master_relation_cond(
-                    $source, $info->{cond},
-                    _get_pk_for_related( $self, $name )
-                )
-                )
-            {
+            if ( _master_relation_cond( $self, $name ) ) {
 
-                #warn "$name is a pre-update rel";
+                #warn "$name is a pre-update rel\n";
                 $pre_updates{$name} = $updates->{$name};
                 next;
             }
             else {
 
-                #warn "$name is a post-update rel";
+                #warn "$name is a post-update rel\n";
                 $post_updates{$name} = $updates->{$name};
                 next;
             }
@@ -114,7 +109,7 @@ sub recursive_update {
         # many-to-many helper accessors
         if ( is_m2m( $self, $name ) ) {
 
-            #warn "$name is a many-to-many helper accessor";
+            #warn "$name is a many-to-many helper accessor\n";
             $other_methods{$name} = $updates->{$name};
             next;
         }
@@ -128,6 +123,8 @@ sub recursive_update {
         }
 
         # unknown
+        # TODO: don't throw a warning instead of an exception to give users
+        #       time to adapt to the new API
         $self->throw_exception(
             "No such column, relationship, many-to-many helper accessor or generic accessor '$name'"
         );
@@ -138,13 +135,19 @@ sub recursive_update {
     # first update columns and other accessors
     # so that later related records can be found
     for my $name ( keys %columns ) {
+
+        #warn "update col $name\n";
         $object->$name( $columns{$name} );
     }
     for my $name ( keys %other_methods ) {
+
+        #warn "update other $name\n";
         $object->$name( $updates->{$name} );
     }
     for my $name ( keys %pre_updates ) {
-        _update_relation( $self, $name, $updates->{$name}, $object,
+
+        #warn "pre_update $name\n";
+        _update_relation( $self, $name, $pre_updates{$name}, $object,
             $if_not_submitted );
     }
 
@@ -152,6 +155,7 @@ sub recursive_update {
     # don't allow insert to recurse to related objects
     # do the recursion ourselves
     # $object->{_rel_in_storage} = 1;
+    #warn "CHANGED: " . $object->is_changed . " IN STOR: " .  $object->in_storage . "\n";
     $object->update_or_insert if $object->is_changed;
 
     # updating many_to_many
@@ -160,6 +164,8 @@ sub recursive_update {
         my $value = $updates->{$name};
 
         if ( is_m2m( $self, $name ) ) {
+
+            #warn "update m2m $name\n";
             my ($pk) = _get_pk_for_related( $self, $name );
             my @rows;
             my $result_source = $object->$name->result_source;
@@ -191,7 +197,9 @@ sub recursive_update {
         }
     }
     for my $name ( keys %post_updates ) {
-        _update_relation( $self, $name, $updates->{$name}, $object,
+
+        #warn "post_update $name\n";
+        _update_relation( $self, $name, $post_updates{$name}, $object,
             $if_not_submitted );
     }
     return $object;
@@ -210,16 +218,17 @@ sub _get_columns_by_accessor {
     return %columns;
 }
 
-# Arguments: $name, $updates, $object, $if_not_submitted
-
+# Arguments: $rs, $name, $updates, $row, $if_not_submitted
 sub _update_relation {
     my ( $self, $name, $updates, $object, $if_not_submitted ) = @_;
 
     # this should never happen because we're checking the paramters passed to
     # recursive_update, but just to be sure...
-    $object->throw_exception("No such relationship '$name' on ")
+    $object->throw_exception("No such relationship '$name'")
         unless $object->has_relationship($name);
 
+    #warn "_update_relation $name: OBJ: " . ref($object) . "\n";
+
     my $info = $object->result_source->relationship_info($name);
 
     # get a related resultset without a condition
@@ -231,6 +240,10 @@ sub _update_relation {
             $self->result_source->_resolve_condition( $info->{cond}, $name,
             $object );
     }
+    else {
+        $self->throw_exception(
+            "result_source must support _resolve_condition");
+    }
 
     # warn "$name resolved: " . Dumper( $resolved ); use Data::Dumper;
     $resolved = {}
@@ -246,13 +259,13 @@ sub _update_relation {
     #warn "REV RELINFO for $name: " . Dumper($revrelinfo);
 
     # the only valid datatype for a has_many rels is an arrayref
-    if ( $info->{attrs}{accessor} eq 'multi') {
-        $self->throw_exception( "data for has_many relationship '$name' must be an arrayref")
+    if ( $info->{attrs}{accessor} eq 'multi' ) {
+        $self->throw_exception(
+            "data for has_many relationship '$name' must be an arrayref")
             unless ref $updates eq 'ARRAY';
 
         my @updated_ids;
         for my $sub_updates ( @{$updates} ) {
-            warn "updating $name";
             my $sub_object = recursive_update(
                 resultset => $related_resultset,
                 updates   => $sub_updates,
@@ -286,6 +299,7 @@ sub _update_relation {
     elsif ($info->{attrs}{accessor} eq 'single'
         || $info->{attrs}{accessor} eq 'filter' )
     {
+        #warn "\tupdating rel '$name': $if_not_submitted\n";
         my $sub_object;
         if ( ref $updates ) {
 
@@ -307,7 +321,7 @@ sub _update_relation {
                 );
             }
         }
-        elsif ( !ref $updates ) {
+        else {
             $sub_object = $related_resultset->find($updates)
                 unless (
                 !$updates
@@ -324,7 +338,9 @@ sub _update_relation {
             );
     }
     else {
-        $self->throw_exception( "recursive_update doesn't now how to handle relationship '$name' with accessor " . $info->{attrs}{accessor});
+        $self->throw_exception(
+            "recursive_update doesn't now how to handle relationship '$name' with accessor "
+                . $info->{attrs}{accessor} );
     }
 }
 
@@ -393,28 +409,57 @@ sub _get_pk_for_related {
 # after the row is inserted into the database
 # relationships before: belongs_to
 # relationships after: has_many, might_have and has_one
+# true means before, false after
 sub _master_relation_cond {
-    my ( $source, $cond, @foreign_ids ) = @_;
-    my $foreign_ids_re = join '|', @foreign_ids;
-    if ( ref $cond eq 'HASH' ) {
-        for my $f_key ( keys %{$cond} ) {
+    my ( $self, $name ) = @_;
+
+    my $source = $self->result_source;
+    my $info   = $source->relationship_info($name);
+
+    #warn "INFO: " . Dumper($info) . "\n";
+
+    # has_many rels are always after
+    return 0
+        if $info->{attrs}->{accessor} eq 'multi';
+
+    my @foreign_ids = _get_pk_for_related( $self, $name );
+
+    #warn "IDS: " . join(', ', @foreign_ids) . "\n";
+
+    my $cond = $info->{cond};
+
+    sub _inner {
+        my ( $source, $cond, @foreign_ids ) = @_;
+
+        while ( my ( $f_key, $col ) = each %{$cond} ) {
 
             # might_have is not master
-            my $col = $cond->{$f_key};
-            $col =~ s/self\.//;
+            $col   =~ s/^self\.//;
+            $f_key =~ s/^foreign\.//;
             if ( $source->column_info($col)->{is_auto_increment} ) {
                 return 0;
             }
-            if ( $f_key =~ /^foreign\.$foreign_ids_re/ ) {
+            if ( any { $_ eq $f_key } @foreign_ids ) {
                 return 1;
             }
         }
+        return 0;
+    }
+
+    if ( ref $cond eq 'HASH' ) {
+        return _inner( $source, $cond, @foreign_ids );
     }
+
+    # arrayref of hashrefs
     elsif ( ref $cond eq 'ARRAY' ) {
         for my $new_cond (@$cond) {
-            return _master_relation_cond( $source, $new_cond, @foreign_ids );
+            return _inner( $source, $new_cond, @foreign_ids );
         }
     }
+    else {
+        $source->throw_exception(
+            "unhandled relation condition " . ref($cond) );
+    }
     return;
 }