use Carp::Clan qw/^DBIx::Class|^HTML::FormHandler|^Try::Tiny/;
use Scalar::Util qw( blessed );
use List::MoreUtils qw/ any /;
+use Try::Tiny;
sub recursive_update {
my %params = @_;
my $source = $self->result_source;
+ croak "first parameter needs to be defined"
+ unless defined $updates;
+
+ croak "first parameter needs to be a hashref"
+ unless ref($updates) eq 'HASH';
+
# warn 'entering: ' . $source->from();
- carp 'fixed fields needs to be an array ref'
+ croak 'fixed fields needs to be an arrayref'
if defined $fixed_fields && ref $fixed_fields ne 'ARRAY';
+ # always warn about additional parameters if storage debugging is enabled
+ $unknown_params_ok = 0
+ if $source->storage->debug;
+
if ( blessed($updates) && $updates->isa('DBIx::Class::Row') ) {
return $updates;
}
- if ( exists $updates->{id} ) {
+
+ if ( !defined $object && exists $updates->{id} ) {
+
# warn "finding object by id " . $updates->{id} . "\n";
$object = $self->find( $updates->{id}, { key => 'primary' } );
+
# warn "object not found by id\n"
# unless defined $object;
}
my %fixed_fields = map { $_ => 1 } @$fixed_fields
if $fixed_fields;
+ # the updates hashref might contain the pk columns
+ # but with an undefined value
my @missing =
- grep { !exists $updates->{$_} && !exists $fixed_fields{$_} }
- $source->primary_columns;
- if ( !$object && !scalar @missing ) {
+ grep {
+ ( !exists $updates->{$_}
+ || ( exists $updates->{$_} && !defined $updates->{$_} ) )
+ && !exists $fixed_fields{$_}
+ } $source->primary_columns;
+
+ # warn "MISSING: " . join(', ', @missing) . "\n";
+ if ( !defined $object && scalar @missing == 0 ) {
# warn 'finding by: ' . Dumper( $updates ); use Data::Dumper;
$object = $self->find( $updates, { key => 'primary' } );
}
+
+ # add the resolved columns to the updates hashref
$updates = { %$updates, %$resolved };
- @missing =
- grep { !exists $resolved->{$_} } @missing;
- if ( !$object && !scalar @missing ) {
+ # the resolved hashref might contain the pk columns
+ # but with an undefined value
+ @missing = grep {
+ !exists $resolved->{$_}
+ || ( exists $resolved->{$_} && !defined $resolved->{$_} )
+ } @missing;
+
+ #warn "MISSING2: " . join( ', ', @missing ) . "\n";
+ if ( !defined $object && scalar @missing == 0 ) {
# warn 'finding by +resolved: ' . Dumper( $updates ); use Data::Dumper;
$object = $self->find( $updates, { key => 'primary' } );
# database like has_many, might_have and has_one
my %post_updates;
my %other_methods;
+ my %m2m_accessors;
my %columns_by_accessor = _get_columns_by_accessor($self);
# warn 'resolved: ' . Dumper( $resolved );
# warn 'updates: ' . Dumper( $updates ); use Data::Dumper;
# warn 'columns: ' . Dumper( \%columns_by_accessor );
for my $name ( keys %$updates ) {
+
# columns
if ( exists $columns_by_accessor{$name}
&& !( $source->has_relationship($name)
if ( is_m2m( $self, $name ) ) {
#warn "$name is a many-to-many helper accessor\n";
- $other_methods{$name} = $updates->{$name};
+ $m2m_accessors{$name} = $updates->{$name};
next;
}
for my $name ( keys %other_methods ) {
#warn "update other $name\n";
- $object->$name( $updates->{$name} );
+ $object->$name( $other_methods{$name} );
}
for my $name ( keys %pre_updates ) {
# don't allow insert to recurse to related objects
# do the recursion ourselves
# $object->{_rel_in_storage} = 1;
- #warn "CHANGED: " . $object->is_changed . "\n":
+ #warn "CHANGED: " . $object->is_changed . "\n";
#warn "IN STOR: " . $object->in_storage . "\n";
$object->update_or_insert if $object->is_changed;
$object->discard_changes;
# updating many_to_many
- for my $name ( keys %$updates ) {
- next if exists $columns{$name};
- my $value = $updates->{$name};
-
- if ( is_m2m( $self, $name ) ) {
-
- #warn "update m2m $name\n";
- my ($pk) = _get_pk_for_related( $self, $name );
- my @rows;
- my $result_source = $object->$name->result_source;
- my @updates;
- if ( !defined $value ) {
- next;
+ for my $name ( keys %m2m_accessors ) {
+ my $value = $m2m_accessors{$name};
+
+ #warn "update m2m $name\n";
+ # TODO: only first pk col is used
+ my ($pk) = _get_pk_for_related( $self, $name );
+ my @rows;
+ my $result_source = $object->$name->result_source;
+ my @updates;
+ if ( defined $value && ref $value eq 'ARRAY' ) {
+ @updates = @{$value};
+ }
+ elsif ( defined $value && !ref $value ) {
+ @updates = ($value);
+ }
+ elsif ( defined $value ) {
+ carp
+ "value of many-to-many rel '$name' must be an arrayref or scalar: $value";
+ }
+ for my $elem (@updates) {
+ if ( blessed($elem) && $elem->isa('DBIx::Class::Row') ) {
+ push @rows, $elem;
}
- elsif ( ref $value ) {
- @updates = @{$value};
+ elsif ( ref $elem eq 'HASH' ) {
+ push @rows,
+ recursive_update(
+ resultset => $result_source->resultset,
+ updates => $elem
+ );
}
else {
- @updates = ($value);
- }
- for my $elem (@updates) {
- if ( ref $elem ) {
- push @rows,
- recursive_update(
- resultset => $result_source->resultset,
- updates => $elem
- );
- }
- else {
- push @rows,
- $result_source->resultset->find( { $pk => $elem } );
- }
+ push @rows,
+ $result_source->resultset->find( { $pk => $elem } );
}
- my $set_meth = 'set_' . $name;
- $object->$set_meth( \@rows );
}
+ my $set_meth = 'set_' . $name;
+ $object->$set_meth( \@rows );
}
for my $name ( keys %post_updates ) {
&& $DBIx::Class::ResultSource::UNRESOLVABLE_CONDITION
== $resolved;
+ #warn "RESOLVED: " . Dumper($resolved); use Data::Dumper;
+
my @rel_cols = keys %{ $info->{cond} };
map {s/^foreign\.//} @rel_cols;
#warn "\tupdating rel '$name': $if_not_submitted\n";
my $sub_object;
if ( ref $updates ) {
+ if ( blessed($updates) && $updates->isa('DBIx::Class::Row') ) {
+ $sub_object = $updates;
+ }
# for might_have relationship
- if ( $info->{attrs}{accessor} eq 'single'
+ elsif ( $info->{attrs}{accessor} eq 'single'
&& defined $object->$name )
{
$sub_object = recursive_update(