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=8992718ae78e52bbe1af5818093d2b182bce6e8d;hp=dfee15b22a08edd50918f2a8fb5e6776cd7abed8;hb=d5e0c363032486e064fe5cf4fba61153060c65f9;hpb=93ad32433881b4de95483fa3e20fffbdce30a8ca

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index dfee15b..8992718 100644
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -1,27 +1,35 @@
+use strict;
+use warnings;
 package DBIx::Class::ResultSet::RecursiveUpdate;
 
-use version; $VERSION = qv('0.001');
+use version; our $VERSION = qv('0.005');
 
-use warnings;
-use strict;
+use base qw(DBIx::Class::ResultSet);
+
+sub recursive_update {
+    my ( $self, $updates, $fixed_fields ) = @_;
+    return DBIx::Class::ResultSet::RecursiveUpdate::Functions::recursive_update(
+        resultset    => $self,
+        updates      => $updates,
+        fixed_fields => $fixed_fields
+    );
+}
+
+package DBIx::Class::ResultSet::RecursiveUpdate::Functions;
 use Carp;
 use Scalar::Util qw( blessed );
 
-use base qw(DBIx::Class::ResultSet);
 
 sub recursive_update {
-    my ( $self, $updates, $fixed_fields ) = @_;
+    my %params = @_;
+    my ( $self, $updates, $fixed_fields, $object ) = @params{ qw/resultset updates fixed_fields object/ }; 
     # 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;
     %fixed_fields = map { $_ => 1 } @$fixed_fields if $fixed_fields;
-
     if ( blessed($updates) && $updates->isa('DBIx::Class::Row') ) {
         return $updates;
     }
-
-
     # direct column accessors
     my %columns;
 
@@ -32,7 +40,8 @@ sub recursive_update {
     # relations that that should be done after the row is inserted into the database
     # like has_many and might_have
     my %post_updates;
-    my %columns_by_accessor = $self->_get_columns_by_accessor;
+    my %other_methods;
+    my %columns_by_accessor = _get_columns_by_accessor( $self );
 
     for my $name ( keys %$updates ) {
         my $source = $self->result_source;
@@ -43,11 +52,14 @@ sub recursive_update {
             $columns{$name} = $updates->{$name};
             next;
         }
+        if( !( $source->has_relationship($name) && ref( $updates->{$name} ) ) ){
+            $other_methods{$name} = $updates->{$name};
+        }
         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)
+                $source, $info->{cond}, _get_pk_for_related( $self, $name)
             )
           )
         {
@@ -59,24 +71,25 @@ sub recursive_update {
     }
     # warn 'columns: ' . Dumper( \%columns ); use Data::Dumper;
 
-    my $object;
     my @missing =
       grep { !exists $columns{$_} && !exists $fixed_fields{$_} } $self->result_source->primary_columns;
-    if ( !scalar @missing ) {
+    if ( !$object && !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
+    # first update columns and other accessors - so that later related records can be found
     for my $name ( keys %columns ) {
         $object->$name( $updates->{$name} );
     }
+    for my $name ( keys %other_methods) {
+        $object->$name( $updates->{$name} ) if $object->can( $name );
+    }
     for my $name ( keys %pre_updates ) {
         my $info = $object->result_source->relationship_info($name);
-        $self->_update_relation( $name, $updates, $object, $info );
+        _update_relation( $self, $name, $updates, $object, $info );
     }
 #    $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;
@@ -86,8 +99,8 @@ sub recursive_update {
         next if exists $columns{$name};
         my $value = $updates->{$name};
 
-        if ( $self->is_m2m($name) ) {
-            my ($pk) = $self->_get_pk_for_related($name);
+        if ( is_m2m( $self, $name) ) {
+            my ($pk) = _get_pk_for_related( $self, $name);
             my @rows;
             my $result_source = $object->$name->result_source;
             for my $elem ( @{ $updates->{$name} } ) {
@@ -105,7 +118,7 @@ sub recursive_update {
     }
     for my $name ( keys %post_updates ) {
         my $info = $object->result_source->relationship_info($name);
-        $self->_update_relation( $name, $updates, $object, $info );
+        _update_relation( $self, $name, $updates, $object, $info );
     }
     return $object;
 }
@@ -124,7 +137,6 @@ sub _get_columns_by_accessor {
 
 sub _update_relation {
     my ( $self, $name, $updates, $object, $info ) = @_;
-
     my $related_result =
       $self->related_resultset($name)->result_source->resultset;
     my $resolved =
@@ -137,14 +149,24 @@ sub _update_relation {
         for my $sub_updates ( @{ $updates->{$name} } ) {
             $sub_updates = { %$sub_updates, %$resolved } if $resolved && ref( $sub_updates ) eq 'HASH';
             my $sub_object =
-              $related_result->recursive_update( $sub_updates );
+              recursive_update( resultset => $related_result, updates => $sub_updates );
         }
     }
     else {
         my $sub_updates = $updates->{$name};
         $sub_updates = { %$sub_updates, %$resolved } if $resolved && ref( $sub_updates ) eq 'HASH';
-        my $sub_object =
-          $related_result->recursive_update( $sub_updates );
+        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 
+            );
+        }
+        else{ 
+           $sub_object =
+             recursive_update( resultset => $related_result, updates => $sub_updates );
+         }
         $object->set_from_related( $name, $sub_object );
     }
 }
@@ -205,8 +227,8 @@ sub _get_pk_for_related {
     }
 
     # many to many case
-    if ( $self->is_m2m($relation) ) {
-        $result_source = $self->get_m2m_source($relation);
+    if ( is_m2m($self, $relation) ) {
+        $result_source = get_m2m_source($self, $relation);
     }
     return $result_source->primary_columns;
 }
@@ -242,16 +264,31 @@ __END__
 
 =head1 NAME
 
-DBIx::Class::ResultSet::RecursiveUpdate - like update_or_create - but recursive 
+DBIx::Class::ResultSet::RecursiveUpdate - like update_or_create - but recursive
 
 
 =head1 VERSION
 
-This document describes DBIx::Class::ResultSet::RecursiveUpdate version 0.001
+This document describes DBIx::Class::ResultSet::RecursiveUpdate version 0.004
 
 
 =head1 SYNOPSIS
 
+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' 
+        } 
+        ] 
+      }
+    );
+
+
+As ResultSet subclass:
+
     __PACKAGE__->load_namespaces( default_resultset_class => '+DBIx::Class::ResultSet::RecursiveUpdate' );
 
 in the Schema file (see t/lib/DBSchema.pm).  Or appriopriate 'use base' in the ResultSet classes. 
@@ -270,6 +307,8 @@ Then:
 
   
 =head1 DESCRIPTION
+This is still experimental. I've added a functional interface so that it can be used 
+in Form Processors and not require modification of the model.
 
 You can feed the ->create method with a recursive datastructure and have the related records
 created.  Unfortunately you cannot do a similar thing with update_or_create - this module
@@ -302,12 +341,13 @@ then you need to inform recursive_update about additional predicate with a secon
       [ 'id' ]
     );
 
+This will work with a new DBIC release.
 
 For a many_to_many (pseudo) relation you can supply a list of primary keys
 from the other table - and it will link the record at hand to those and
 only those records identified by them.  This is convenient for handling web
 forms with check boxes (or a SELECT box with multiple choice) that let you
-update such (pseudo) relations.
+update such (pseudo) relations.  
 
 For a description how to set up base classes for ResultSets see load_namespaces
 in DBIx::Class::Schema.