X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Frelationship%2Fcustom.t;h=3d47fb17d69ab8cab15917d020c099b14d2dbbba;hb=b8a270548277cf47dbe171d66e9f1352e5d1dc0e;hp=060bb381c3cc7a6734fde663730e149b0f33532a;hpb=93508f48904821b475a06d9d2652ff6e8dd0cb98;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/relationship/custom.t b/t/relationship/custom.t
index 060bb38..3d47fb1 100644
--- a/t/relationship/custom.t
+++ b/t/relationship/custom.t
@@ -4,8 +4,7 @@ use warnings;
 use Test::More;
 use Test::Exception;
 use lib qw(t/lib);
-use DBICTest;
-use DBIC::SqlMakerTest;
+use DBICTest ':DiffSQL';
 
 my $schema = DBICTest->init_schema();
 
@@ -139,9 +138,6 @@ is_deeply(
   '16 correct cds found'
 );
 
-TODO: {
-local $TODO = 'Prefetch on custom rels can not work until the collapse rewrite is finished '
-  . '(currently collapser requires a right-side (which is indeterministic) order-by)';
 lives_ok {
 
 my @all_artists_with_80_cds_pref = $schema->resultset("Artist")->search
@@ -154,7 +150,6 @@ is_deeply(
 );
 
 } 'prefetchy-fetchy-fetch';
-} # end of TODO
 
 
 # try to create_related a 80s cd
@@ -194,8 +189,8 @@ for my $cd ($schema->resultset('CD')->search ({}, { order_by => 'cdid'})->all) {
 }
 
 my $last_tracks_rs = $schema->resultset('Track')->search (
-  {'next_track.trackid' => undef},
-  { join => 'next_track', order_by => 'me.cd' },
+  {'next_tracks.trackid' => undef},
+  { join => 'next_tracks', order_by => 'me.cd' },
 );
 
 is_deeply (