From 6239425671e0ed46863cf0e669740abf3cf26fec Mon Sep 17 00:00:00 2001 From: zby Date: Sun, 19 Apr 2009 09:24:23 +0000 Subject: [PATCH] Functional interface --- Changes | 3 + Makefile.PL | 1 + README | 20 ++---- lib/DBIx/Class/ResultSet/RecursiveUpdate.pm | 70 +++++++++++++------- t/lib/RunTests.pm | 8 +-- t/var/dvdzbr.db | Bin 37888 -> 37888 bytes 6 files changed, 59 insertions(+), 43 deletions(-) diff --git a/Changes b/Changes index f845cd9..7dde183 100644 --- a/Changes +++ b/Changes @@ -1,5 +1,8 @@ Revision history for DBIx-Class-RecursivePUT +0.0.4 Sun Apr 19 11:15:57 CEST 2009 + Added functional interface - for easy use in Form Processors + 0.0.1 Wed Jun 18 13:09:28 2008 Initial release. diff --git a/Makefile.PL b/Makefile.PL index aa282a9..1eb3120 100644 --- a/Makefile.PL +++ b/Makefile.PL @@ -15,6 +15,7 @@ WriteMakefile( 'DBIx::Class::IntrospectableM2M' => 0, 'SQL::Translator' => '0.08', 'DateTime' => 0, + 'DBD::SQLite' => 0, }, dist => { COMPRESS => 'gzip -9f', SUFFIX => 'gz', }, clean => { FILES => 'DBIx-Class-ResultSet-RecursiveUpdate-*' }, diff --git a/README b/README index 7802081..ebb1ab5 100644 --- a/README +++ b/README @@ -1,19 +1,8 @@ DBIx-Class-RecursiveUpdate version 0.0.1 -[ REPLACE THIS... - - The README is used to introduce the module and provide instructions on - how to install the module, any machine dependencies it may have (for - example C compilers and installed libraries) and any other information - that should be understood before the module is installed. - - A README file is required for CPAN modules since CPAN extracts the - README file from a module distribution so that people browsing the - archive can use it get an idea of the modules uses. It is usually a - good idea to provide version information here so that people can - decide whether fixes for the module are worth downloading. -] - +You can feed the ->create method with a recursive datastructure and have the related records +created. Unfortunately you cannot do a similar thing with update_or_create - this module +tries to fill that void. INSTALLATION @@ -27,8 +16,7 @@ To install this module, run the following commands: DEPENDENCIES -None. - +See Makefile.PL COPYRIGHT AND LICENCE diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm index f440967..1bc5aae 100644 --- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm +++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm @@ -1,22 +1,32 @@ +use strict; +use warnings; package DBIx::Class::ResultSet::RecursiveUpdate; -use version; $VERSION = qv('0.002'); +use version; our $VERSION = qv('0.004'); -use warnings; -use strict; +use base qw(DBIx::Class::ResultSet); + +sub recursive_update { + my ( $self, $updates, $fixed_fields ) = @_; + return DBIx::Class::ResultSet::RecursiveUpdate::Functions::recursive_update( + resultset => $self, + updates => $updates, + fixed_fields => $fixed_fields + ); +} + +package DBIx::Class::ResultSet::RecursiveUpdate::Functions; use Carp; use Scalar::Util qw( blessed ); -use base qw(DBIx::Class::ResultSet); sub recursive_update { - my ( $self, $updates, $fixed_fields ) = @_; + my %params = @_; + my ( $self, $updates, $fixed_fields, $object ) = @params{ qw/resultset updates fixed_fields object/ }; # warn 'entering: ' . $self->result_source->from(); - carp 'fixed fields needs to be an array ref' if $fixed_fields && ref($fixed_fields) ne 'ARRAY'; my %fixed_fields; %fixed_fields = map { $_ => 1 } @$fixed_fields if $fixed_fields; - if ( blessed($updates) && $updates->isa('DBIx::Class::Row') ) { return $updates; } @@ -32,7 +42,7 @@ sub recursive_update { # relations that that should be done after the row is inserted into the database # like has_many and might_have my %post_updates; - my %columns_by_accessor = $self->_get_columns_by_accessor; + my %columns_by_accessor = _get_columns_by_accessor( $self ); for my $name ( keys %$updates ) { my $source = $self->result_source; @@ -47,7 +57,7 @@ sub recursive_update { my $info = $source->relationship_info($name); if ( _master_relation_cond( - $source, $info->{cond}, $self->_get_pk_for_related($name) + $source, $info->{cond}, _get_pk_for_related( $self, $name) ) ) { @@ -59,10 +69,9 @@ sub recursive_update { } # warn 'columns: ' . Dumper( \%columns ); use Data::Dumper; - my $object; my @missing = grep { !exists $columns{$_} && !exists $fixed_fields{$_} } $self->result_source->primary_columns; - if ( !scalar @missing ) { + if ( !$object && !scalar @missing ) { $object = $self->find( \%columns, { key => 'primary' } ); } $object ||= $self->new( {} ); @@ -73,7 +82,7 @@ sub recursive_update { } for my $name ( keys %pre_updates ) { my $info = $object->result_source->relationship_info($name); - $self->_update_relation( $name, $updates, $object, $info ); + _update_relation( $self, $name, $updates, $object, $info ); } # $self->_delete_empty_auto_increment($object); @@ -86,8 +95,8 @@ sub recursive_update { next if exists $columns{$name}; my $value = $updates->{$name}; - if ( $self->is_m2m($name) ) { - my ($pk) = $self->_get_pk_for_related($name); + if ( is_m2m( $self, $name) ) { + my ($pk) = _get_pk_for_related( $self, $name); my @rows; my $result_source = $object->$name->result_source; for my $elem ( @{ $updates->{$name} } ) { @@ -105,7 +114,7 @@ sub recursive_update { } for my $name ( keys %post_updates ) { my $info = $object->result_source->relationship_info($name); - $self->_update_relation( $name, $updates, $object, $info ); + _update_relation( $self, $name, $updates, $object, $info ); } return $object; } @@ -124,7 +133,6 @@ sub _get_columns_by_accessor { sub _update_relation { my ( $self, $name, $updates, $object, $info ) = @_; - my $related_result = $self->related_resultset($name)->result_source->resultset; my $resolved = @@ -137,14 +145,14 @@ sub _update_relation { for my $sub_updates ( @{ $updates->{$name} } ) { $sub_updates = { %$sub_updates, %$resolved } if $resolved && ref( $sub_updates ) eq 'HASH'; my $sub_object = - $related_result->recursive_update( $sub_updates ); + recursive_update( resultset => $related_result, updates => $sub_updates ); } } else { my $sub_updates = $updates->{$name}; $sub_updates = { %$sub_updates, %$resolved } if $resolved && ref( $sub_updates ) eq 'HASH'; my $sub_object = - $related_result->recursive_update( $sub_updates ); + recursive_update( resultset => $related_result, updates => $sub_updates ); $object->set_from_related( $name, $sub_object ); } } @@ -205,8 +213,8 @@ sub _get_pk_for_related { } # many to many case - if ( $self->is_m2m($relation) ) { - $result_source = $self->get_m2m_source($relation); + if ( is_m2m($self, $relation) ) { + $result_source = get_m2m_source($self, $relation); } return $result_source->primary_columns; } @@ -242,16 +250,31 @@ __END__ =head1 NAME -DBIx::Class::ResultSet::RecursiveUpdate - like update_or_create - but recursive +DBIx::Class::ResultSet::RecursiveUpdate - like update_or_create - but recursive =head1 VERSION -This document describes DBIx::Class::ResultSet::RecursiveUpdate version 0.001 +This document describes DBIx::Class::ResultSet::RecursiveUpdate version 0.004 =head1 SYNOPSIS +The functional interface: + + my $new_item = DBIx::Class::ResultSet::RecursiveUpdate::Functions::recursive_update({ + id => 1, + owned_dvds => [ + { + title => 'One Flew Over the Cuckoo's Nest' + } + ] + } + ); + + +As ResultSet subclass: + __PACKAGE__->load_namespaces( default_resultset_class => '+DBIx::Class::ResultSet::RecursiveUpdate' ); in the Schema file (see t/lib/DBSchema.pm). Or appriopriate 'use base' in the ResultSet classes. @@ -270,7 +293,8 @@ Then: =head1 DESCRIPTION -This is the first release - so treat it as experimental. +This is still experimental. I've added a functional interface so that it can be used +in Form Processors and not require modification of the model. You can feed the ->create method with a recursive datastructure and have the related records created. Unfortunately you cannot do a similar thing with update_or_create - this module diff --git a/t/lib/RunTests.pm b/t/lib/RunTests.pm index 3ba2afc..4557e01 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 => 27; + plan tests => 28; my $dvd_rs = $schema->resultset( 'Dvd' ); my $user_rs = $schema->resultset( 'User' ); @@ -76,14 +76,14 @@ sub run_tests{ ok ( $onekey, 'Onekey created' ); ok ( $schema->resultset( 'Twokeys_belongsto' )->find( { key1 => $onekey->id, key2 => 1 } ), 'Twokeys created' ); - + is ( $dvd->name, 'Test name', 'Dvd name set' ); # changing existing records my $num_of_users = $user_rs->count; $updates = { id => $dvd->id, aaaa => undef, - name => 'Test name', + name => undef, tags => [ ], 'owner' => $another_owner->id, current_borrower => { @@ -99,7 +99,7 @@ sub run_tests{ $dvd = $dvd_rs->recursive_update( $updates ); is ( $schema->resultset( 'User' )->count, $initial_user_count + 1, "No new user created" ); - is ( $dvd->name, 'Test name', 'Dvd name set' ); + is ( $dvd->name, undef, 'Dvd name deleted' ); 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' ); diff --git a/t/var/dvdzbr.db b/t/var/dvdzbr.db index 4d090fe07bdb742325bbf0ed942f47cba54591ee..9a0af95f433be0839af4d3eaa758a2d359d7b1e2 100644 GIT binary patch delta 236 zcmZoz!PKyVX@Zncod5#_hyy7g+rDa}&KYKod(l8H*S*k9ENm=7@(j%TnHMm3GZ!*P zG5a!`G0SgkWM`f%#;wQA&Bh5-$jAsJHb-!8k!HFVI@v$!(jU?M(L~C-2kCV7eDISwlaY>0b2asru6unC>M{4p8f2 z*1eZ9*=~}|ACxbi#BO_30NNRD3LSABS>gEXUEz(SPR44mKecGha!OC<; zZE}}x726$kHgS8&$q&^eCLizQXK7@+qcPc3ubt_R=Hz{P8BBMyCTr+tGu_eNJXL?X z0@EGi$pLCz%({0>CfiMtnH(P}$PCmmxn^Pq+Z`h|aaVb;LFQ@_tSpV%cMK-43tY=| dM`v~5@ -- 2.45.2