add test script for mysql

[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 c3a1356047ce1984751a8eb861ddbb6df17bfe63..f8b567de3a2f6c701f5999a7ec1c87f08e301df8 100644 (file)
--- a/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
+++ b/lib/DBIx/Class/ResultSet/RecursiveUpdate.pm
@@ -37,6 +37,7 @@ package DBIx::Class::ResultSet::RecursiveUpdate::Functions;
 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 = @_;
@@ -49,40 +50,64 @@ sub recursive_update {
 
     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();
     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{$_} }
+        grep { !defined $updates->{$_} && !exists $fixed_fields{$_} }
         $source->primary_columns;
-    if ( !$object && !scalar @missing ) {
+
+    # 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 ) {
 
-        # warn 'finding by +resolved: ' . Dumper( $updates ); use Data::Dumper;
+    # the resolved hashref might contain the pk columns
+    # but with an undefined value
+    @missing = grep { !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' } );
     }
 
-    $object = $self->new( {} )
+    $object = $self->new_result( {} )
         unless defined $object;
 
     # warn Dumper( $updates ); use Data::Dumper;
@@ -104,6 +129,7 @@ sub recursive_update {
     #    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)
@@ -181,7 +207,7 @@ sub recursive_update {
             $if_not_submitted );
     }
 
-    # $self->_delete_empty_auto_increment($object);
+    _delete_empty_auto_increment($object);
     # don't allow insert to recurse to related objects
     # do the recursion ourselves
     # $object->{_rel_in_storage} = 1;
@@ -197,7 +223,7 @@ sub recursive_update {
         #warn "update m2m $name\n";
         # TODO: only first pk col is used
         my ($pk) = _get_pk_for_related( $self, $name );
-        my @rows = ();
+        my @rows;
         my $result_source = $object->$name->result_source;
         my @updates;
         if ( defined $value && ref $value eq 'ARRAY' ) {
@@ -206,16 +232,20 @@ sub recursive_update {
         elsif ( defined $value && !ref $value ) {
             @updates = ($value);
         }
-        else {
-            carp "value of many-to-many rel '$name' must be an arrayref or scalar";
+        elsif ( defined $value ) {
+            carp
+                "value of many-to-many rel '$name' must be an arrayref or scalar: $value";
         }
         for my $elem (@updates) {
-            if ( ref $elem ) {
+            if ( blessed($elem) && $elem->isa('DBIx::Class::Row') ) {
                 push @rows, $elem;
-                    # recursive_update(
-                    # resultset => $result_source->resultset,
-                    # updates   => $elem
-                    # );
+            }
+            elsif ( ref $elem eq 'HASH' ) {
+                push @rows,
+                    recursive_update(
+                    resultset => $result_source->resultset,
+                    updates   => $elem
+                    );
             }
             else {
                 push @rows,
@@ -280,6 +310,8 @@ sub _update_relation {
             && $DBIx::Class::ResultSource::UNRESOLVABLE_CONDITION
             == $resolved;
 
+    #warn "RESOLVED: " . Dumper($resolved); use Data::Dumper;
+
     my @rel_cols = keys %{ $info->{cond} };
     map {s/^foreign\.//} @rel_cols;
 
@@ -294,7 +326,7 @@ sub _update_relation {
                 ->{is_nullable};
     }
 
-    $if_not_submitted = $all_fks_nullable ? 'nullify' : 'delete'
+    $if_not_submitted = $all_fks_nullable ? 'set_to_null' : 'delete'
         unless defined $if_not_submitted;
 
     #warn "\tNULLABLE: $all_fks_nullable ACTION: $if_not_submitted\n";
@@ -355,9 +387,9 @@ sub _update_relation {
                 $rs_rel_delist =
                     $rs_rel_delist->search_rs( { -not => [@cond] } );
             }
+            #warn "\tCOND: " . Dumper(\@cond);
         }
 
-        #warn "\tCOND: " . Dumper(\%cond);
         #my $rel_delist_cnt = $rs_rel_delist->count;
         if ( $if_not_submitted eq 'delete' ) {
 
@@ -378,9 +410,12 @@ sub _update_relation {
         #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(
@@ -428,7 +463,7 @@ sub is_m2m {
     if ( $rclass->can('_m2m_metadata') ) {
         return $rclass->_m2m_metadata->{$relation};
     }
-    my $object = $self->new( {} );
+    my $object = $self->new_result( {} );
     if (    $object->can($relation)
         and !$self->result_source->has_relationship($relation)
         and $object->can( 'set_' . $relation ) )
@@ -449,13 +484,13 @@ sub get_m2m_source {
             ->related_source(
             $rclass->_m2m_metadata->{$relation}{foreign_relation} );
     }
-    my $object = $self->new( {} );
+    my $object = $self->new_result( {} );
     my $r = $object->$relation;
     return $r->result_source;
 }
 
 sub _delete_empty_auto_increment {
-    my ( $self, $object ) = @_;
+    my ( $object ) = @_;
     for my $col ( keys %{ $object->{_column_data} } ) {
         if ($object->result_source->column_info($col)->{is_auto_increment}
             and ( !defined $object->{_column_data}{$col}