From ac35ef944e4615837f455945207fd9070a5d707c Mon Sep 17 00:00:00 2001 From: Alexander Hartmaier Date: Mon, 4 Oct 2010 16:33:33 +0200 Subject: [PATCH] check for nonexisting column, relationship, many-to-many helper accessor or generic accessor --- lib/DBIx/Class/ResultSet/RecursiveUpdate.pm | 64 ++++++++++++++++----- t/lib/RunTests.pm | 23 ++++++-- 2 files changed, 67 insertions(+), 20 deletions(-) diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm index 78a4bb2..da7e938 100644 --- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm +++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm @@ -77,29 +77,59 @@ sub recursive_update { # warn 'columns: ' . Dumper( \%columns_by_accessor ); for my $name ( keys %$updates ) { my $source = $self->result_source; - if ( $columns_by_accessor{$name} + + # columns + if ( exists $columns_by_accessor{$name} && !( $source->has_relationship($name) && ref( $updates->{$name} ) ) ) { + + #warn "$name is a column"; $columns{$name} = $updates->{$name}; next; } - if ( !( $source->has_relationship($name) ) ) { + + # relationships + if ( $source->has_relationship($name) ) { + my $info = $source->relationship_info($name); + if (_master_relation_cond( + $source, $info->{cond}, + _get_pk_for_related( $self, $name ) + ) + ) + { + + #warn "$name is a pre-update rel"; + $pre_updates{$name} = $updates->{$name}; + next; + } + else { + + #warn "$name is a post-update rel"; + $post_updates{$name} = $updates->{$name}; + next; + } + } + + # many-to-many helper accessors + if ( is_m2m( $self, $name ) ) { + + #warn "$name is a many-to-many helper accessor"; $other_methods{$name} = $updates->{$name}; next; } - my $info = $source->relationship_info($name); - if (_master_relation_cond( - $source, $info->{cond}, - _get_pk_for_related( $self, $name ) - ) - ) - { - $pre_updates{$name} = $updates->{$name}; - } - else { - $post_updates{$name} = $updates->{$name}; + + # accessors + if ( $object->can($name) && not $source->has_relationship($name) ) { + + #warn "$name is an accessor"; + $other_methods{$name} = $updates->{$name}; + next; } + + # unknown + $self->throw_exception( + "No such column, relationship, many-to-many helper accessor or generic accessor '$name'"); } # warn 'other: ' . Dumper( \%other_methods ); use Data::Dumper; @@ -110,7 +140,7 @@ sub recursive_update { $object->$name( $columns{$name} ); } for my $name ( keys %other_methods ) { - $object->$name( $updates->{$name} ) if $object->can($name); + $object->$name( $updates->{$name} ); } for my $name ( keys %pre_updates ) { _update_relation( $self, $name, $updates->{$name}, $object, @@ -183,6 +213,12 @@ sub _get_columns_by_accessor { sub _update_relation { my ( $self, $name, $updates, $object, $if_not_submitted ) = @_; + + # this should never happen because we're checking the paramters passed to + # recursive_update, but just to be sure... + $object->throw_exception("No such relationship '$name' on ") + unless $object->has_relationship($name); + my $info = $object->result_source->relationship_info($name); # get a related resultset without a condition diff --git a/t/lib/RunTests.pm b/t/lib/RunTests.pm index 88ec1c9..336b7ff 100644 --- a/t/lib/RunTests.pm +++ b/t/lib/RunTests.pm @@ -9,7 +9,7 @@ use DBIx::Class::ResultSet::RecursiveUpdate; sub run_tests{ my $schema = shift; - plan tests => 41; + plan tests => 42; my $dvd_rs = $schema->resultset( 'Dvd' ); my $user_rs = $schema->resultset( 'User' ); @@ -20,6 +20,16 @@ sub run_tests{ my $initial_dvd_count = $dvd_rs->count; my $updates; + # try to create with a not existing rel + $updates = { + name => 'Test name for nonexisting rel', + username => 'nonexisting_rel', + password => 'whatever', + nonexisting => { foo => 'bar' }, + }; + eval { my $nonexisting_user = $user_rs->recursive_update( $updates ); }; + like ($@, qr/No such column, relationship, many-to-many helper accessor or generic accessor 'nonexisting'/, 'nonexisting column, accessor, relationship fails'); + # creating new record linked to some old record $updates = { name => 'Test name 2', @@ -38,7 +48,7 @@ sub run_tests{ # creating new records $updates = { - aaaa => undef, + #aaaa => undef, tags => [ '2', { id => '3' } ], name => 'Test name', owner => $owner, @@ -82,7 +92,7 @@ sub run_tests{ my $num_of_users = $user_rs->count; $updates = { id => $dvd->dvd_id, # id instead of dvd_id - aaaa => undef, + ####aaaa => undef, name => undef, tags => [ ], 'owner' => $another_owner->id, @@ -145,6 +155,7 @@ sub run_tests{ is( scalar @tags, 2, 'Tags in has_many related record saved' ); ok( $owned_dvds{'temp name 2'}, 'Second name in a has_many related record saved' ); + # update has_many where foreign cols aren't nullable $updates = { id => $user->id, address => { @@ -152,14 +163,13 @@ sub run_tests{ city => "Podunk", state => "New York" }, - owned_dvds =>[ + owned_dvds => [ { id => 1, }, ] }; $user = $user_rs->recursive_update( $updates ); - $user = $user_rs->recursive_update( $updates ); is( $schema->resultset( 'Address' )->search({ user_id => $user->id })->count, 1, 'the right number of addresses' ); $dvd = $dvd_rs->find( 1 ); @@ -182,10 +192,11 @@ sub run_tests{ ); is( $user->borrowed_dvds->count, 1, 'set_to_null' ); + # has_many where foreign cols are nullable $dvd_rs->update( { current_borrower => $user->id } ); $updates = { id => $user->id, - borrowed_dvds =>[ + borrowed_dvds => [ { id => $dvd->id }, -- 2.45.2