gshank / dbix-class-resultset-recursiveupdate Goto Github PK

% git diff
diff --git a/t/01_basic.t b/t/01_basic.t
index 8f31dde..db89bfd 100644
--- a/t/01_basic.t
+++ b/t/01_basic.t
@@ -282,6 +282,16 @@ is( $schema->resultset('Address')->search( { user_id => $user->id } )->count,
 $dvd = $dvd_rs->find(1);
 is( $dvd->get_column('owner'), $user->id, 'foreign key set' );

+$user_rs->recursive_update({
+    id      => $user->id,
+    address => {
+        street => "101 Main Street",
+        city   => "Podunk",
+        state  => "New York"
+    },
+    owned_dvds => [ 1 ]
+});
+
 # has_many where foreign cols are nullable
 my $available_dvd_rs = $dvd_rs->search( { current_borrower => undef } );
 $dvd_rs->update( { current_borrower => $user->id } );

% prove -I lib -v t/01_basic.t
t/01_basic.t .. testing dbi:SQLite:dbname=t/var/dvdzbr.db

ok 1 - fixed_fields pre 0.21 api ok
ok 2 - fixed_fields 0.21+ api ok
...
ok 43 - the right number of addresses
ok 44 - foreign key set
DBIx::Class::ResultSet::RecursiveUpdate::recursive_update(): first parameter needs to be a hashref at t/01_basic.t line 285
# Tests were run but no plan was declared and done_testing() was not seen.
Dubious, test returned 255 (wstat 65280, 0xff00)
All 44 subtests passed

Test Summary Report
-------------------
t/01_basic.t (Wstat: 65280 Tests: 44 Failed: 0)
  Non-zero exit status: 255
  Parse errors: No plan found in TAP output
Files=1, Tests=44,  1 wallclock secs ( 0.04 usr  0.00 sys +  0.72 cusr  0.08 csys =  0.84 CPU)
Result: FAIL

owner => { name => "Thing" },

for my $constraint (
    sort { $b eq 'primary' ? 1 : $a eq 'primary' ? -1 : $a cmp $b }  # make primary first
$source->unique_constraint_names) {
    last if defined $object; 

    # the updates hashref might contain the constraint columns
    # but with an undefined value
    my @missing =
        grep { !defined $updates->{$_} && !exists $fixed_fields{$_} }
        $source->unique_constraint_columns($constraint);

    #warn "MISSING $constraint: " . join(', ', @missing) . "\n";
    unless ( @missing ) {
        warn 'finding by: ' . Dumper( $updates ); use Data::Dumper;
        $object = $self->find( $updates, { key => $constraint } );
    }
    last if defined $object; 

    # add the resolved columns to the updates hashref
    $updates = { %$updates, %$resolved };

    # the resolved hashref might contain the constraint columns
    # but with an undefined value
    @missing = grep { !defined $resolved->{$_} } @missing;

    #warn "MISSING2 $constraint: " . join( ', ', @missing ) . "\n";
    unless ( @missing ) {
        warn 'finding by +resolved: ' . Dumper( $updates ); use Data::Dumper;
        $object = $self->find( $updates, { key => $constraint } );
    }

}

diag '* second create_related with same arguments';
eval {
    my $artist = $schema->resultset('Artist')->first;

    my $cd_result = $schema->resultset('CD')->recursive_update(
        {

            artist => $artist->artistid,

            title  => 'TestOneCD2',
            year   => 2007,
            tracks => [

                {   pos   => 111,
                    title => 'TrackOne',
                },
                {   pos   => 112,
                    title => 'TrackTwo',
                }
            ],

            liner_notes => { notes => 'I can haz liner notes?' },
            genre => { name => 'TestGenre' }

        }
    );

    ok( $cd_result && ref $cd_result eq 'DBICTest::CD', "Got Good CD Class" );
    ok( $cd_result->title eq "TestOneCD2",             "Got Expected Title" );
    ok( $cd_result->notes eq 'I can haz liner notes?', 'Liner notes' );

    my $tracks = $cd_result->tracks;

    ok( $tracks->isa("DBIx::Class::ResultSet"),
        "Got Expected Tracks ResultSet"
    );

    foreach my $track ( $tracks->all ) {
        ok( $track && ref $track eq 'DBICTest::Track',
            'Got Expected Track Class' );
    }
};
diag $@ if $@;

diag '* third create_related with non-primary unique key';
eval {
    my $artist = $schema->resultset('Artist')->first;

    my $cd_result = $schema->resultset('CD')->recursive_update(
        {

            artist => $artist->artistid,

            title  => 'TestOneCD2',
            year   => 2007,
            tracks => [

                {   pos   => 111,
                    title => 'TrackOne',
                },
                {   pos   => 112,
                    title => 'TrackTwo',
                }
            ],

            liner_notes => { notes => 'I can haz liner notes?' },
            genre => { name => 'TestGenre' }

        }
    );

    ok( $cd_result && ref $cd_result eq 'DBICTest::CD', "Got Good CD Class" );
    ok( $cd_result->title eq "TestOneCD2",             "Got Expected Title" );
    ok( $cd_result->notes eq 'I can haz liner notes?', 'Liner notes' );
    ok( $cd_result->genre->name eq 'TestGenre', 'Got Expected Genre' );

    my $tracks = $cd_result->tracks;

    ok( $tracks->isa("DBIx::Class::ResultSet"),
        "Got Expected Tracks ResultSet"
    );

    foreach my $track ( $tracks->all ) {
        ok( $track && ref $track eq 'DBICTest::Track',
            'Got Expected Track Class' );
    }
};
diag $@ if $@;

$sub_object->get_columns() = {
          'dvd_id' => 5,
          'notes' => 'test note',
          'liner_notes_belongs_to' => 1
        };
Now $object->set_from_related($name, $sub_object) is called and then:
$sub_object->get_columns() = {
          'dvd_id' => 5,
          'notes' => 'test note',
          'liner_notes_belongs_to' => undef
        };