X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Frelationship%2Fcustom.t;h=543c7c0997841a46359f1cf0600228db9fbc9245;hb=c9733800;hp=4fb96ff087672093790e0bd1db5c01a3431c7de5;hpb=abf8d91e24dae052a0af4b65ffee4e72044d54bb;p=dbsrgits%2FDBIx-Class.git diff --git a/t/relationship/custom.t b/t/relationship/custom.t index 4fb96ff..543c7c0 100644 --- a/t/relationship/custom.t +++ b/t/relationship/custom.t @@ -35,50 +35,99 @@ foreach my $artwork (@artworks) { my $cds_80s_rs = $artist->cds_80s; -is_same_sql_bind($cds_80s_rs->as_query, - '(SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track FROM cd me'. - ' WHERE ( ( me.artist = ? AND ( me.year < ? AND me.year > ? ) ) ))', - [ - [ 'me.artist' => 4 ], - [ 'me.year' => 1990 ], - [ 'me.year' => 1979 ], - ]); +is_same_sql_bind( + $cds_80s_rs->as_query, + '( + SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track + FROM cd me + WHERE ( ( me.artist = ? AND ( me.year < ? AND me.year > ? ) ) ) + )', + [ + [ + { sqlt_datatype => 'integer', dbic_colname => 'me.artist' } + => 21 + ], + [ + { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'me.year' } + => 1990 + ], + [ + { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'me.year' } + => 1979 + ], + ], +); my @cds_80s = $cds_80s_rs->all; is(@cds_80s, 6, '6 80s cds found (1980 - 1985)'); map { ok($_->year < 1990 && $_->year > 1979) } @cds_80s; -# this is the current version, enhanced version below. + my $cds_90s_rs = $artist2->cds_90s; -is_same_sql_bind($cds_90s_rs->as_query, - '(SELECT cds_90s.cdid, cds_90s.artist, cds_90s.title, cds_90s.year, cds_90s.genreid,'. - ' cds_90s.single_track FROM artist artist__row JOIN cd cds_90s ON ( cds_90s.artist = artist__row.artistid'. - ' AND ( cds_90s.year < ? AND cds_90s.year > ? ) ) WHERE ( artist__row.artistid = ? ))', - [ - [ 'cds_90s.year' => 2000 ], - [ 'cds_90s.year' => 1989 ], - [ 'artist__row.artistid' => 5 ], - ]); +is_same_sql_bind( + $cds_90s_rs->as_query, + '( + SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track + FROM artist artist__row + JOIN cd me + ON ( me.artist = artist__row.artistid AND ( me.year < ? AND me.year > ? ) ) + WHERE ( artist__row.artistid = ? ) + )', + [ + [ + { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'me.year' } + => 2000 + ], + [ + { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'me.year' } + => 1989 + ], + [ { sqlt_datatype => 'integer', dbic_colname => 'artist__row.artistid' } + => 22 + ], + ] +); -TODO: { - local $TODO = 'enhanced aliasing in search_related'; - my $cds_90s_rs = $artist2->cds_90s; - is_same_sql_bind($cds_90s_rs->as_query, - '(SELECT me.cdid, me.artist, me.title, me.year, me.genreid,'. - ' me.single_track FROM artist artist__row JOIN cd me ON ( me.artist = artist__row.artistid'. - ' AND ( me.year < ? AND me.year > ? ) ) WHERE ( artist__row.artistid = ? ))', - [ - [ 'me.year' => 2000 ], - [ 'me.year' => 1989 ], - [ 'artist__row.artistid' => 5 ], - ]); +# re-test with ::-containing moniker name +# (we don't have any currently, so fudge it with lots of local() ) +{ + local $schema->source('Artist')->{source_name} = 'Ar::Tist'; + local $artist2->{related_resultsets}; + + is_same_sql_bind( + $artist2->cds_90s->as_query, + '( + SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track + FROM artist ar_tist__row + JOIN cd me + ON ( me.artist = ar_tist__row.artistid AND ( me.year < ? AND me.year > ? ) ) + WHERE ( ar_tist__row.artistid = ? ) + )', + [ + [ + { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'me.year' } + => 2000 + ], + [ + { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'me.year' } + => 1989 + ], + [ { sqlt_datatype => 'integer', dbic_colname => 'ar_tist__row.artistid' } + => 22 + ], + ] + ); } + + my @cds_90s = $cds_90s_rs->all; is(@cds_90s, 6, '6 90s cds found (1990 - 1995) even with non-optimized search'); map { ok($_->year < 2000 && $_->year > 1989) } @cds_90s; -my @cds_90s_95 = $artist2->cds_90s->search({ 'year' => 1995 }); -is(@cds_90s_95, 1, '1 90s (95) cds found even with non-optimized search'); -map { ok($_->year == 1995) } @cds_90s_95; +lives_ok { + my @cds_90s_95 = $artist2->cds_90s->search({ 'me.year' => 1995 }); + is(@cds_90s_95, 1, '1 90s (95) cds found even with non-optimized search'); + map { ok($_->year == 1995) } @cds_90s_95; +} 'should preserve chain-head "me" alias (API-consistency)'; # search for all artists prefetching published cds in the 80s... my @all_artists_with_80_cds = $schema->resultset("Artist")->search @@ -111,7 +160,8 @@ is_deeply( # try to create_related a 80s cd throws_ok { $artist->create_related('cds_80s', { title => 'related creation 1' }); -} qr/\Qunable to set_from_related via complex 'cds_80s' condition on column(s): 'year'/, 'Create failed - complex cond'; +} qr/\QCustom relationship 'cds_80s' not definitive - returns conditions instead of values for column(s): 'year'/, +'Create failed - complex cond'; # now supply an explicit arg overwriting the ambiguous cond my $id_2020 = $artist->create_related('cds_80s', { title => 'related creation 2', year => '2020' })->id; @@ -132,28 +182,40 @@ is( # try a specific everything via a non-simplified rel throws_ok { $artist->create_related('cds_90s', { title => 'related_creation 4', year => '2038' }); -} qr/\Qunable to set_from_related - no simplified condition available for 'cds_90s'/, 'Create failed - non-simplified rel'; +} qr/\QCustom relationship 'cds_90s' does not resolve to a join-free condition fragment/, +'Create failed - non-simplified rel'; # Do a self-join last-entry search -my @last_track_ids; +my @last_tracks; for my $cd ($schema->resultset('CD')->search ({}, { order_by => 'cdid'})->all) { - push @last_track_ids, $cd->tracks - ->search ({}, { order_by => { -desc => 'position'} }) - ->get_column ('trackid') - ->next; + push @last_tracks, $cd->tracks + ->search ({}, { order_by => { -desc => 'position'} }) + ->next || (); } -my $last_tracks = $schema->resultset('Track')->search ( - {'next_track.trackid' => undef}, - { join => 'next_track', order_by => 'me.cd' }, +my $last_tracks_rs = $schema->resultset('Track')->search ( + {'next_tracks.trackid' => undef}, + { join => 'next_tracks', order_by => 'me.cd' }, ); is_deeply ( - [$last_tracks->get_column ('trackid')->all], - [ grep { $_ } @last_track_ids ], + [$last_tracks_rs->get_column ('trackid')->all], + [ map { $_->trackid } @last_tracks ], 'last group-entry via self-join works', ); +is_deeply ( + [map { $_->last_track->id } grep { $_->last_track } $schema->resultset('CD')->search ({}, { order_by => 'cdid', prefetch => 'last_track'})->all], + [ map { $_->trackid } @last_tracks ], + 'last_track via insane subquery condition works', +); + +is_deeply ( + [map { $_->last_track->id } grep { $_->last_track } $schema->resultset('CD')->search ({}, { order_by => 'cdid'})->all], + [ map { $_->trackid } @last_tracks ], + 'last_track via insane subquery condition works, even without prefetch', +); + my $artwork = $schema->resultset('Artwork')->search({},{ order_by => 'cd_id' })->first; my @artists = $artwork->artists->all; is(scalar @artists, 2, 'the two artists are associated'); @@ -188,4 +250,27 @@ lives_ok { is(scalar @artists, 1, 'only one artist is associated'); +# Make a single for each last_track +my @singles = map { + $_->create_related('cd_single', { + title => $_->title . ' (the single)', + artist => $artist, + year => 1999, + }) } @last_tracks +; + +# See if chaining works +is_deeply ( + [ map { $_->title } $last_tracks_rs->search_related('cd_single')->all ], + [ map { $_->title } @singles ], + 'Retrieved singles in proper order' +); + +# See if prefetch works +is_deeply ( + [ map { $_->cd_single->title } $last_tracks_rs->search({}, { prefetch => 'cd_single' })->all ], + [ map { $_->title } @singles ], + 'Prefetched singles in proper order' +); + done_testing;