use warnings;
package DBIx::Class::ResultSet::RecursiveUpdate;
-use version; our $VERSION = qv('0.004');
+use version; our $VERSION = qv('0.005');
use base qw(DBIx::Class::ResultSet);
if ( blessed($updates) && $updates->isa('DBIx::Class::Row') ) {
return $updates;
}
-
-
+ # warn Dumper( $updates ); use Data::Dumper;
# direct column accessors
my %columns;
# relations that that should be done after the row is inserted into the database
# like has_many and might_have
my %post_updates;
+ my %other_methods;
my %columns_by_accessor = _get_columns_by_accessor( $self );
-
for my $name ( keys %$updates ) {
my $source = $self->result_source;
if ( $columns_by_accessor{$name}
$columns{$name} = $updates->{$name};
next;
}
- next if !$source->has_relationship($name);
+ if( !( $source->has_relationship($name) ) ){
+ $other_methods{$name} = $updates->{$name};
+ next;
+ }
my $info = $source->relationship_info($name);
if (
_master_relation_cond(
$post_updates{$name} = $updates->{$name};
}
}
- # warn 'columns: ' . Dumper( \%columns ); use Data::Dumper;
+ # warn 'other: ' . Dumper( \%other_methods ); use Data::Dumper;
my @missing =
grep { !exists $columns{$_} && !exists $fixed_fields{$_} } $self->result_source->primary_columns;
}
$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);
_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;
}
else {
my $sub_updates = $updates->{$name};
- $sub_updates = { %$sub_updates, %$resolved } if $resolved && ref( $sub_updates ) eq 'HASH';
- my $sub_object =
- recursive_update( resultset => $related_result, updates => $sub_updates );
+ my $sub_object;
+ if( ref $sub_updates ){
+ $sub_updates = { %$sub_updates, %$resolved } if $resolved && ref( $sub_updates ) eq 'HASH';
+ # for might_have relationship
+ 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 );
+ }
+ }
+ elsif( ! ref $sub_updates ){
+ $sub_object = $related_result->find( $sub_updates );
+ }
$object->set_from_related( $name, $sub_object );
}
}