exclude DBIx::Class, HTML::FormHandler and Try::Tiny from carp blames

[chaz/p5-DBIx-Class-ResultSet-RecursiveUpdate] / lib / DBIx / Class / ResultSet / RecursiveUpdate.pm

diff --git a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
index 84b61c45edf2aff0e0c4916e98474c2531872ef8..cdfd1ffca61472f2c085eb638bdbcf7328a99b2c 100644 (file)
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -2,44 +2,64 @@ use strict;
 use warnings;
 
 package DBIx::Class::ResultSet::RecursiveUpdate;
 use warnings;
 
 package DBIx::Class::ResultSet::RecursiveUpdate;

+

 # ABSTRACT: like update_or_create - but recursive
 
 use base qw(DBIx::Class::ResultSet);
 
 sub recursive_update {
 # ABSTRACT: like update_or_create - but recursive
 
 use base qw(DBIx::Class::ResultSet);
 
 sub recursive_update {

-    my ( $self, $updates, $fixed_fields ) = @_;
+    my ( $self, $updates, $attrs ) = @_;
+
+    my $fixed_fields;
+    my $unknown_params_ok;
+
+    # 0.21+ api
+    if ( defined $attrs && ref $attrs eq 'HASH' ) {
+        $fixed_fields      = $attrs->{fixed_fields};
+        $unknown_params_ok = $attrs->{unknown_params_ok};
+    }
+
+    # pre 0.21 api
+    elsif ( defined $attrs && ref $attrs eq 'ARRAY' ) {
+        $fixed_fields = $attrs;
+    }
+

     return
         DBIx::Class::ResultSet::RecursiveUpdate::Functions::recursive_update(
     return
         DBIx::Class::ResultSet::RecursiveUpdate::Functions::recursive_update(

-        resultset    => $self,
-        updates      => $updates,
-        fixed_fields => $fixed_fields
+        resultset         => $self,
+        updates           => $updates,
+        fixed_fields      => $fixed_fields,
+        unknown_params_ok => $unknown_params_ok,

         );
 }
 
 package DBIx::Class::ResultSet::RecursiveUpdate::Functions;
         );
 }
 
 package DBIx::Class::ResultSet::RecursiveUpdate::Functions;

-use Carp;
+use Carp::Clan qw/^DBIx::Class|^HTML::FormHandler|^Try::Tiny/;

 use Scalar::Util qw( blessed );
 use List::MoreUtils qw/ any /;
 
 sub recursive_update {
     my %params = @_;
     my ( $self, $updates, $fixed_fields, $object, $resolved,
 use Scalar::Util qw( blessed );
 use List::MoreUtils qw/ any /;
 
 sub recursive_update {
     my %params = @_;
     my ( $self, $updates, $fixed_fields, $object, $resolved,

-        $if_not_submitted )
+        $if_not_submitted, $unknown_params_ok )

         = @params{
         = @params{

-        qw/resultset updates fixed_fields object resolved if_not_submitted/};
+        qw/resultset updates fixed_fields object resolved if_not_submitted unknown_params_ok/
+        };

     $resolved ||= {};
 
     # warn 'entering: ' . $self->result_source->from();
     carp 'fixed fields needs to be an array ref'
     $resolved ||= {};
 
     # 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 defined $fixed_fields && ref $fixed_fields ne 'ARRAY';
+

     if ( blessed($updates) && $updates->isa('DBIx::Class::Row') ) {
         return $updates;
     }
     if ( $updates->{id} ) {
         $object = $self->find( $updates->{id}, { key => 'primary' } );
     }
     if ( blessed($updates) && $updates->isa('DBIx::Class::Row') ) {
         return $updates;
     }
     if ( $updates->{id} ) {
         $object = $self->find( $updates->{id}, { key => 'primary' } );
     }

+
+    my %fixed_fields = map { $_ => 1 } @$fixed_fields
+        if $fixed_fields;

     my @missing =
         grep { !exists $updates->{$_} && !exists $fixed_fields{$_} }
         $self->result_source->primary_columns;
     my @missing =
         grep { !exists $updates->{$_} && !exists $fixed_fields{$_} }
         $self->result_source->primary_columns;


@@ -122,11 +142,16 @@ sub recursive_update {
         }
 
         # unknown
         }
 
         # unknown

-        # TODO: don't throw a warning instead of an exception to give users
-        #       time to adapt to the new API
-        $self->throw_exception(
+
+        # don't throw a warning instead of an exception to give users
+        # time to adapt to the new API
+        carp(

             "No such column, relationship, many-to-many helper accessor or generic accessor '$name'"
             "No such column, relationship, many-to-many helper accessor or generic accessor '$name'"

-        );
+        ) unless $unknown_params_ok;
+
+#$self->throw_exception(
+#    "No such column, relationship, many-to-many helper accessor or generic accessor '$name'"
+#);

     }
 
     # warn 'other: ' . Dumper( \%other_methods ); use Data::Dumper;
     }
 
     # warn 'other: ' . Dumper( \%other_methods ); use Data::Dumper;


@@ -256,7 +281,7 @@ sub _update_relation {
     map {s/^foreign\.//} @rel_cols;
 
     #warn "REL_COLS: " . Dumper(@rel_cols); use Data::Dumper;
     map {s/^foreign\.//} @rel_cols;
 
     #warn "REL_COLS: " . Dumper(@rel_cols); use Data::Dumper;

-    my $rel_col_cnt = scalar @rel_cols;
+    #my $rel_col_cnt = scalar @rel_cols;

 
     # find out if all related columns are nullable
     my $all_fks_nullable = 1;
 
     # find out if all related columns are nullable
     my $all_fks_nullable = 1;


@@ -321,9 +346,11 @@ sub _update_relation {
                 }
                 push @cond, \%cond_for_obj;
             }
                 }
                 push @cond, \%cond_for_obj;
             }

+

             # only limit resultset if there are related rows left
             # only limit resultset if there are related rows left

-            if (scalar @cond) {
-                $rs_rel_delist = $rs_rel_delist->search_rs( { -not => [@cond] } );
+            if ( scalar @cond ) {
+                $rs_rel_delist =
+                    $rs_rel_delist->search_rs( { -not => [@cond] } );

             }
         }
 
             }
         }
 


@@ -512,61 +539,61 @@ sub _master_relation_cond {
 1;    # Magic true value required at end of module
 __END__
 
 1;    # Magic true value required at end of module
 __END__
 

-=head1 NAME
-
-DBIx::Class::ResultSet::RecursiveUpdate - like update_or_create - but recursive
-

 =head1 SYNOPSIS
 
 =head1 SYNOPSIS
 

-The functional interface:
+    # The functional interface:

 
 

-    my $new_item = DBIx::Class::ResultSet::RecursiveUpdate::Functions::recursive_update({ 
-        resultset => $schema->resultset( 'Dvd' ),
+    my $schema = MyDB::Schema->connect();
+    my $new_item = DBIx::Class::ResultSet::RecursiveUpdate::Functions::recursive_update(
+        resultset => $schema->resultset('User'),

         updates => {
         updates => {

-            id => 1, 
-            owned_dvds => [ 
-                { 
-                  title => 'One Flew Over the Cuckoo's Nest' 
-                } 
-            ] 
-        }
-    });
+            id => 1,
+            owned_dvds => [
+                {
+                    title => "One Flew Over the Cuckoo's Nest"
+                }
+            ]
+        },
+        unknown_params_ok => 1,
+    );

 
 
 
 

-As ResultSet subclass:
+    # As ResultSet subclass:

 
     __PACKAGE__->load_namespaces( default_resultset_class => '+DBIx::Class::ResultSet::RecursiveUpdate' );
 
 
     __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. 
+    # in the Schema file (see t/lib/DBSchema.pm).  Or appropriate 'use base' in the ResultSet classes.

 
 

-Then:
+    my $user = $schema->resultset('User')->recursive_update({
+        id => 1,
+        owned_dvds => [
+            {
+                title => "One Flew Over the Cuckoo's Nest"
+            }
+        ]
+    }, {
+        unknown_params_ok => 1,
+    });

 
 

-    my $user = $user_rs->recursive_update( { 
-        id => 1, 
-        owned_dvds => [ 
-        { 
-          title => 'One Flew Over the Cuckoo's Nest' 
-        } 
-        ] 
-      }
-    );

 
 

-  

 =head1 DESCRIPTION
 
 =head1 DESCRIPTION
 

-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.
+This is still experimental.
+
+You can feed the ->create method of DBIx::Class 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 until L<DBIx::Class> has an api itself.

 
 

-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. 
+The functional interface can be used without modifications of the model,
+for example by form processors like L<HTML::FormHandler::Model::DBIC>.

 
 

-It is a base class for ResultSets providing just one method: recursive_update
+It is a base class for L<DBIx::Class::ResultSet>s providing the method recursive_update

 which works just like update_or_create but can recursively update or create
 data objects composed of multiple rows. All rows need to be identified by primary keys
 - so you need to provide them in the update structure (unless they can be deduced from 
 the parent row - for example when you have a belongs_to relationship).  
 which works just like update_or_create but can recursively update or create
 data objects composed of multiple rows. All rows need to be identified by primary keys
 - so you need to provide them in the update structure (unless they can be deduced from 
 the parent row - for example when you have a belongs_to relationship).  

-If not all colums comprising the primary key are specified - then a new row will be created,
+If not all columns comprising the primary key are specified a new row will be created,

 with the expectation that the missing columns will be filled by it (as in the case of auto_increment 
 primary keys).  
 
 with the expectation that the missing columns will be filled by it (as in the case of auto_increment 
 primary keys).  
 


@@ -576,28 +603,27 @@ like in the case of:
     
     my $restricted_rs = $user_rs->search( { id => 1 } );
 
     
     my $restricted_rs = $user_rs->search( { id => 1 } );
 

-then you need to inform recursive_update about additional predicate with a second argument:
+then you need to inform recursive_update about the additional predicate with the fixed_fields attribute:

 
 

-    my $user = $restricted_rs->recursive_update( { 
-        owned_dvds => [ 
-        { 
-          title => 'One Flew Over the Cuckoo's Nest' 
-        } 
-        ] 
-      },
-      [ 'id' ]
+    my $user = $restricted_rs->recursive_update( {
+            owned_dvds => [
+            {
+                title => 'One Flew Over the Cuckoo's Nest'
+            }
+            ]
+        },
+        {
+            fixed_fields => [ 'id' ],
+        }

     );
 
     );
 

-This will work with a new DBIC release.
-

 For a many_to_many (pseudo) relation you can supply a list of primary keys
 For a many_to_many (pseudo) relation you can supply a list of primary keys

-from the other table - and it will link the record at hand to those and
+from the other table and it will link the record at hand to those and

 only those records identified by them.  This is convenient for handling web
 only those records identified by them.  This is convenient for handling web

-forms with check boxes (or a SELECT box with multiple choice) that let you
+forms with check boxes (or a select field with multiple choice) that lets you

 update such (pseudo) relations.  
 
 update such (pseudo) relations.  
 

-For a description how to set up base classes for ResultSets see load_namespaces
-in DBIx::Class::Schema.
+For a description how to set up base classes for ResultSets see L<DBIx::Class::Schema/load_namespaces>.

 
 =head1 DESIGN CHOICES
 
 
 =head1 DESIGN CHOICES
 


@@ -720,7 +746,7 @@ Clearing the relationship:
 
 =head2 Treatment of many-to-many pseudo relations
 
 
 =head2 Treatment of many-to-many pseudo relations
 

-The function gets the information about m2m relations from DBIx::Class::IntrospectableM2M.
+The function gets the information about m2m relations from L<DBIx::Class::IntrospectableM2M>.

 If it isn't loaded in the ResultSource classes the code relies on the fact that:
 
     if($object->can($name) and
 If it isn't loaded in the ResultSource classes the code relies on the fact that:
 
     if($object->can($name) and