From 863ebdd6ecb92e434d8f18f91c79ebdf0e937fe3 Mon Sep 17 00:00:00 2001 From: zby Date: Mon, 2 Feb 2009 14:49:33 +0000 Subject: [PATCH] workaround for updating records with might_have plus tests --- lib/DBIx/Class/ResultSet/RecursiveUpdate.pm | 44 ++++++++++---------- t/lib/RunTests.pm | 9 +++- t/var/dvdzbr.db | Bin 30720 -> 30720 bytes 3 files changed, 30 insertions(+), 23 deletions(-) diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm index 95725d0..3929e49 100644 --- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm +++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm @@ -14,6 +14,12 @@ sub recursive_update { if( blessed( $updates ) && $updates->isa( 'DBIx::Class::Row' ) ){ return $updates; } + my %columns; + for my $name ( keys %$updates ){ + if( $self->is_for_column( $name, $updates->{$name} ) ){ + $columns{$name} = $updates->{$name}; + } + } my $object; # warn 'cond: ' . Dumper( $self->{cond} ); use Data::Dumper; # warn 'where: ' . Dumper( $self->{attrs}{where} ); use Data::Dumper; @@ -22,29 +28,27 @@ sub recursive_update { $self->{cond} = undef; $self->{attrs}{where} = undef; if( ! scalar @missing ){ - $object = $self->find( $updates, { key => 'primary' } ); + $object = $self->find( \%columns, { key => 'primary' } ); } } else{ - $object = $self->find( $updates, { key => 'primary' } ); + $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 %$updates ){ - if( $self->is_for_column( $object, $name, $updates->{$name} ) ) { + for my $name ( keys %columns ){ $object->$name( $updates->{$name} ); - } } for my $name ( keys %$updates ){ - if($object->can($name) && !$self->is_for_column( $object, $name, $updates->{$name} ) ){ + if($object->can($name) && !$self->is_for_column( $name, $updates->{$name} ) ){ # updating relations that that should be done before the row is inserted into the database # like belongs_to my $info = $object->result_source->relationship_info( $name ); 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 $resolved = $self->result_source->resolve_condition( @@ -91,7 +95,7 @@ sub recursive_update { } } # might_have and has_one case - elsif ( ! _master_relation_cond( $object, $info->{cond}, $self->_get_pk_for_related( $name ) ) ){ + elsif ( ! _master_relation_cond( $object->result_source, $info->{cond}, $self->_get_pk_for_related( $name ) ) ){ my $sub_object = $object->search_related( $name )->recursive_update( $value ); #$object->set_from_related( $name, $sub_object ); } @@ -100,20 +104,18 @@ sub recursive_update { return $object; } -sub is_for_column { - my( $self, $object, $name, $value ) = @_; - return - $object->can($name) - && !( - $object->result_source->has_relationship($name) +sub is_for_column { + my( $self, $name, $value ) = @_; + my $source = $self->result_source; + return + $source->has_column($name) + && !( + $source->has_relationship($name) && ref( $value ) ) - && ( - $object->result_source->has_column($name) - || !$object->can( 'set_' . $name ) - ) } + sub is_m2m { my( $self, $relation ) = @_; my $rclass = $self->result_class; @@ -177,14 +179,14 @@ sub _get_pk_for_related { } 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/ ){ @@ -193,7 +195,7 @@ sub _master_relation_cond { } }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; diff --git a/t/lib/RunTests.pm b/t/lib/RunTests.pm index cce65e0..0c877f8 100644 --- a/t/lib/RunTests.pm +++ b/t/lib/RunTests.pm @@ -9,7 +9,7 @@ use Test::More; sub run_tests{ my $schema = shift; - plan tests => 24; + plan tests => 25; my $dvd_rs = $schema->resultset( 'Dvd' ); my $user_rs = $schema->resultset( 'User' ); @@ -82,7 +82,10 @@ sub run_tests{ username => 'new name a', name => 'new name a', password => 'new password a', - } + }, + liner_notes => { + notes => 'test note changed', + }, }; $dvd = $dvd_rs->recursive_update( $updates ); @@ -91,6 +94,8 @@ sub run_tests{ is ( $dvd->owner->id, $another_owner->id, 'Owner updated' ); is ( $dvd->current_borrower->name, 'new name a', 'Related record modified' ); is ( $dvd->tags->count, 0, 'Tags deleted' ); + is ( $dvd->liner_notes->notes, 'test note changed', 'might_have record changed' ); + # repeatable diff --git a/t/var/dvdzbr.db b/t/var/dvdzbr.db index bac7b17abeec4cedd13cbebb9b52c3d7253f4e5c..6e962cf0e4836c48f4d389eb8e9a1ddf30daa566 100644 GIT binary patch delta 291 zcmY++y-vb#7{%f8w*C_hX_OFA)Px0a5Slo-sd3Q6&~7#nKgvgKg;GE|83#586C-)` z8k`uU_uvg22PfkyCc+Jvh=YS?_zh=xy5mT99Jx!zI(g~eHiD7P4D3|JE%}aJ9V|zu2}M@ZZ-gWMO1B8dY-RQdC*05I zgj4>`TnbnsvAM`2eSsgcvxHLkm_3{#lv&Od2^F?-*Mus6B%g2Ox7 zt$-^M+e^PdIMR$2!Z~jh+JqX1g+8IqWqks8{Hd=K8r(CI>=`QW8hZpk>>00u(B%5T XjX>*9;Z@3O^QWt+i698d)d~77`anH4d5>+RY}q5F;@W6bYS-1Dk`1k$ids zE=~;c--8!$;^5?NG{Oy-SO*8s@D68qdgEkooV<0+&O_qg*4j@i&x(#*{Aw`bW}yyK z!jj_XQ_(e{B$lE^H!7aBqsDMSQwa*|r8h!~ze?wXG}ql-g5ZJc6EghmUI