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=95725d0a5b9764ab58ebc5642092ccfe6d94c009;hp=39366e714674d98aa619de482be6f46e0aa83662;hb=ecf081dd43f887e5a7458601f636ae9e5e8c5832;hpb=76b92189b37b84fed8fff6df90966e9c0d4d581b

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index 39366e7..95725d0 100644
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -5,47 +5,61 @@ use version; $VERSION = qv('0.001');
 use warnings;
 use strict;
 use Carp;
+use Scalar::Util qw( blessed );
 
 use base qw(DBIx::Class::ResultSet);
 
 sub recursive_update { 
-    my( $self, $updates ) = @_;
+    my( $self, $updates, $fixed_fields ) = @_;
+    if( blessed( $updates ) && $updates->isa( 'DBIx::Class::Row' ) ){
+        return $updates;
+    }
     my $object;
-    $object = $self->find( $updates, { key => 'primary' } ) || $self->new( {} );
+#    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' } );
+        }
+    }
+    else{
+        $object = $self->find( $updates, { 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($object->can($name)){
-            my $value = $updates->{$name};
+        if( $self->is_for_column( $object, $name, $updates->{$name} ) ) {
+            $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
-            if( $object->result_source->has_relationship($name) 
-                    and 
-                ref $value
-            ){
                 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 $sub_object = $related_result->recursive_update( $value );
+                    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 );
                 }
-            }
-            # columns and other accessors
-            elsif( $object->result_source->has_column($name) 
-                    or 
-                !$object->can( 'set_' . $name ) 
-            ) {
-                $object->$name($value);
-            }
         }
-        #warn Dumper($object->{_column_data}); use Data::Dumper;
     }
     $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->{_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
@@ -55,16 +69,22 @@ sub recursive_update {
         # many to many case
         if( $self->is_m2m( $name ) ) {
                 my ( $pk ) = $self->_get_pk_for_related( $name );
-                my @values = @{$updates->{$name}};
                 my @rows;
                 my $result_source = $object->$name->result_source;
-                @rows = $result_source->resultset->search({ $pk => [ @values ] } ) if @values; 
+                for my $elem ( @{$updates->{$name}} ){
+                    if( ref $elem ){
+                        push @rows, $result_source->resultset->find( $elem );
+                    }
+                    else{
+                        push @rows, $result_source->resultset->find( { $pk => $elem } );
+                    }
+                }
                 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
+            # 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 );
@@ -80,11 +100,30 @@ sub recursive_update {
     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 is_m2m {
     my( $self, $relation ) = @_;
+    my $rclass = $self->result_class;
+    # DBIx::Class::IntrospectableM2M
+    if( $rclass->can( '_m2m_metadata' ) ){
+        return $rclass->_m2m_metadata->{$relation};
+    }
     my $object = $self->new({});
     if ( $object->can($relation) and 
-        !$object->result_source->has_relationship($relation) and 
+        !$self->result_source->has_relationship($relation) and 
         $object->can( 'set_' . $relation)
     ){
         return 1;
@@ -94,6 +133,17 @@ sub is_m2m {
 
 sub get_m2m_source {
     my( $self, $relation ) = @_;
+    my $rclass = $self->result_class;
+    # DBIx::Class::IntrospectableM2M
+    if( $rclass->can( '_m2m_metadata' ) ){
+        return $self->result_source
+        ->related_source( 
+            $rclass->_m2m_metadata->{$relation}{relation}
+        )
+        ->related_source( 
+            $rclass->_m2m_metadata->{$relation}{foreign_relation} 
+        );
+    }
     my $object = $self->new({});
     my $r = $object->$relation;
     return $r->result_source;
@@ -149,8 +199,6 @@ sub _master_relation_cond {
     return;
 }
 
-# Module implementation here
-
 
 1; # Magic true value required at end of module
 __END__