sub recursive_update {
my( $self, $updates, $fixed_fields ) = @_;
+# warn 'entering: ' . $self->result_source->from();
if( blessed( $updates ) && $updates->isa( 'DBIx::Class::Row' ) ){
return $updates;
}
my $object;
-# 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' } );
+# warn 'fixed_fields: ' . Dumper( $fixed_fields ); use Data::Dumper;
+ if( $fixed_fields ){
+ carp if !( ref( $fixed_fields ) eq 'HASH' );
+ $updates = { %$updates, %$fixed_fields };
+ }
+ my %columns;
+ for my $name ( keys %$updates ){
+ if( $self->is_for_column( $name, $updates->{$name} ) ){
+ $columns{$name} = $updates->{$name};
}
}
- else{
- $object = $self->find( $updates, { key => 'primary' } );
+# warn 'columns: ' . Dumper( \%columns ); use Data::Dumper;
+ my @missing = grep { !exists $columns{$_} } $self->result_source->primary_columns;
+ if( ! 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
+ for my $name ( keys %columns ){
+ $object->$name( $updates->{$name} );
+ }
for my $name ( keys %$updates ){
- if($object->can($name)){
- my $value = $updates->{$name};
-
+ next if exists $columns{ $name };
+ if(
+ #$object->can($name)
+ $object->result_source->has_relationship($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'
+ if( $info #and not $info->{attrs}{accessor} eq 'multi'
and
- _master_relation_cond( $object, $info->{cond}, $self->_get_pk_for_related( $name ) )
+ _master_relation_cond( $object->result_source, $info->{cond}, $self->_get_pk_for_related( $name ) )
){
- my $related_result = $object->related_resultset( $name );
- my $sub_object = $related_result->recursive_update( $value );
- $object->set_from_related( $name, $sub_object );
+ my $related_result = $self->related_resultset( $name )->result_source->resultset;
+ my $resolved = $self->result_source->resolve_condition(
+ $info->{cond}, $name, $object
+ );
+# warn 'resolved: ' . Dumper( $resolved ); use Data::Dumper;
+ $resolved = undef if $DBIx::Class::ResultSource::UNRESOLVABLE_CONDITION == $resolved;
+ if( ref $updates->{$name} eq 'ARRAY' ){
+ for my $sub_updates ( @{$updates->{$name}} ) {
+ my $sub_object = $related_result->recursive_update( $sub_updates, $resolved );
+ }
+ }
+ else {
+ my $sub_object = $related_result->recursive_update( $updates->{$name}, $resolved );
+ $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;
-# warn Dumper( $object->{_column_data} );
+# $object->{_rel_in_storage} = 1;
$object->update_or_insert;
# updating relations that can be done only after the row is inserted into the database
# like has_many and many_to_many
for my $name ( keys %$updates ){
+ next if exists $columns{ $name };
my $value = $updates->{$name};
# many to many case
if( $self->is_m2m( $name ) ) {
}
elsif( $object->result_source->has_relationship($name) ){
my $info = $object->result_source->relationship_info( $name );
+ next if ( _master_relation_cond( $object->result_source, $info->{cond}, $self->_get_pk_for_related( $name ) ) );
# has many case (and similar)
+ my $resolved = $self->result_source->resolve_condition(
+ $info->{cond}, $name, $object
+ );
+# warn 'resolved: ' . Dumper( $resolved ); use Data::Dumper;
+ $resolved = undef if $DBIx::Class::ResultSource::UNRESOLVABLE_CONDITION == $resolved;
+ my $related_result = $self->related_resultset( $name )->result_source->resultset;
if( ref $updates->{$name} eq 'ARRAY' ){
for my $sub_updates ( @{$updates->{$name}} ) {
- my $sub_object = $object->search_related( $name )->recursive_update( $sub_updates );
+ my $sub_object = $related_result->recursive_update( $sub_updates, $resolved );
}
}
# might_have and has_one case
- elsif ( ! _master_relation_cond( $object, $info->{cond}, $self->_get_pk_for_related( $name ) ) ){
- my $sub_object = $object->search_related( $name )->recursive_update( $value );
+ else{
+ my $sub_object = $related_result->recursive_update( $value, $resolved );
#$object->set_from_related( $name, $sub_object );
}
}
return $object;
}
+sub is_for_column {
+ my( $self, $name, $value ) = @_;
+ my $source = $self->result_source;
+ return
+ $source->has_column($name)
+ && !(
+ $source->has_relationship($name)
+ && ref( $value )
+ )
+}
+
+
sub is_m2m {
my( $self, $relation ) = @_;
my $rclass = $self->result_class;
sub _get_pk_for_related {
my ( $self, $relation ) = @_;
-
my $result_source;
if( $self->result_source->has_relationship( $relation ) ){
$result_source = $self->result_source->related_source( $relation );
}
sub _master_relation_cond {
- my ( $object, $cond, @foreign_ids ) = @_;
+ my ( $source, $cond, @foreign_ids ) = @_;
my $foreign_ids_re = join '|', @foreign_ids;
if ( ref $cond eq 'HASH' ){
for my $f_key ( keys %{$cond} ) {
# might_have is not master
my $col = $cond->{$f_key};
$col =~ s/self\.//;
- if( $object->column_info( $col )->{is_auto_increment} ){
+ if( $source->column_info( $col )->{is_auto_increment} ){
return 0;
}
if( $f_key =~ /^foreign\.$foreign_ids_re/ ){
}
}elsif ( ref $cond eq 'ARRAY' ){
for my $new_cond ( @$cond ) {
- return 1 if _master_relation_cond( $object, $new_cond, @foreign_ids );
+ return 1 if _master_relation_cond( $source, $new_cond, @foreign_ids );
}
}
return;
}
-
1; # Magic true value required at end of module
__END__