more relationship validation in _update_relation

[chaz/p5-DBIx-Class-ResultSet-RecursiveUpdate] / lib / DBIx / Class / ResultSet / RecursiveUpdate.pm

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index 78a4bb261f40175cec39ac910f65961795134afa..dcf370752d16a4fa47ac39fbf3c9d11524eff0ec 100644 (file)
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -77,29 +77,60 @@ sub recursive_update {
     #    warn 'columns: ' . Dumper( \%columns_by_accessor );
     for my $name ( keys %$updates ) {
         my $source = $self->result_source;
-        if ( $columns_by_accessor{$name}
+
+        # columns
+        if ( exists $columns_by_accessor{$name}
             && !( $source->has_relationship($name)
                 && ref( $updates->{$name} ) ) )
         {
+
+            #warn "$name is a column";
             $columns{$name} = $updates->{$name};
             next;
         }
-        if ( !( $source->has_relationship($name) ) ) {
+
+        # 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 )
+                )
+                )
+            {
+
+                #warn "$name is a pre-update rel";
+                $pre_updates{$name} = $updates->{$name};
+                next;
+            }
+            else {
+
+                #warn "$name is a post-update rel";
+                $post_updates{$name} = $updates->{$name};
+                next;
+            }
+        }
+
+        # many-to-many helper accessors
+        if ( is_m2m( $self, $name ) ) {
+
+            #warn "$name is a many-to-many helper accessor";
             $other_methods{$name} = $updates->{$name};
             next;
         }
-        my $info = $source->relationship_info($name);
-        if (_master_relation_cond(
-                $source, $info->{cond},
-                _get_pk_for_related( $self, $name )
-            )
-            )
-        {
-            $pre_updates{$name} = $updates->{$name};
-        }
-        else {
-            $post_updates{$name} = $updates->{$name};
+
+        # accessors
+        if ( $object->can($name) && not $source->has_relationship($name) ) {
+
+            #warn "$name is an accessor";
+            $other_methods{$name} = $updates->{$name};
+            next;
         }
+
+        # unknown
+        $self->throw_exception(
+            "No such column, relationship, many-to-many helper accessor or generic accessor '$name'"
+        );
     }
 
     # warn 'other: ' . Dumper( \%other_methods ); use Data::Dumper;
@@ -110,7 +141,7 @@ sub recursive_update {
         $object->$name( $columns{$name} );
     }
     for my $name ( keys %other_methods ) {
-        $object->$name( $updates->{$name} ) if $object->can($name);
+        $object->$name( $updates->{$name} );
     }
     for my $name ( keys %pre_updates ) {
         _update_relation( $self, $name, $updates->{$name}, $object,
@@ -183,6 +214,12 @@ sub _get_columns_by_accessor {
 
 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 ")
+        unless $object->has_relationship($name);
+
     my $info = $object->result_source->relationship_info($name);
 
     # get a related resultset without a condition
@@ -201,10 +238,21 @@ sub _update_relation {
             && $DBIx::Class::ResultSource::UNRESOLVABLE_CONDITION
             == $resolved;
 
-    # an arrayref is only valid for has_many rels
-    if ( ref $updates eq 'ARRAY' ) {
+    my $rel_col_cnt = scalar keys %{ $info->{cond} };
+    use Data::Dumper;
+    warn "RELINFO for $name: " . Dumper($info);
+    warn "REL_COL_CNT: $rel_col_cnt";
+
+    #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")
+            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,
@@ -235,7 +283,9 @@ sub _update_relation {
             }
         }
     }
-    else {
+    elsif ($info->{attrs}{accessor} eq 'single'
+        || $info->{attrs}{accessor} eq 'filter' )
+    {
         my $sub_object;
         if ( ref $updates ) {
 
@@ -273,6 +323,9 @@ sub _update_relation {
                 && $info->{attrs}{join_type} eq 'LEFT' )
             );
     }
+    else {
+        $self->throw_exception( "recursive_update doesn't now how to handle relationship '$name' with accessor " . $info->{attrs}{accessor});
+    }
 }
 
 sub is_m2m {