Force xt/ tests to run on anything involving a create_distdir

[dbsrgits/DBIx-Class.git] / t / prefetch / incomplete.t

diff --git a/t/prefetch/incomplete.t b/t/prefetch/incomplete.t
index 000a386..02c648b 100644 (file)
--- a/t/prefetch/incomplete.t
+++ b/t/prefetch/incomplete.t
@@ -1,13 +1,11 @@
 use strict;
-use warnings;  
+use warnings;
 
 use Test::More;
 use Test::Exception;
 use lib qw(t/lib);
 use DBICTest;
 
-plan tests => 9;
-
 my $schema = DBICTest->init_schema();
 
 lives_ok(sub {
@@ -23,7 +21,7 @@ lives_ok(sub {
       prefetch => [ qw/ cds / ],
       order_by => [ { -desc => 'me.name' }, 'cds.title' ],
       select => [qw/ me.name  cds.title / ],
-    },
+    }
   );
 
   is ($rs->count, 2, 'Correct number of collapsed artists');
@@ -34,57 +32,6 @@ lives_ok(sub {
 }, 'explicit prefetch on a keyless object works');
 
 
-lives_ok ( sub {
-
-  my $rs = $schema->resultset('CD')->search(
-    {},
-    {
-      order_by => [ { -desc => 'me.year' } ],
-    }
-  );
-  my $years = [qw/ 2001 2001 1999 1998 1997/];
-
-  is_deeply (
-    [ $rs->search->get_column('me.year')->all ],
-    $years,
-    'Expected years (at least one duplicate)',
-  );
-
-  my @cds_and_tracks;
-  for my $cd ($rs->all) {
-    my $data->{year} = $cd->year;
-    for my $tr ($cd->tracks->all) {
-      push @{$data->{tracks}}, { $tr->get_columns };
-    }
-    push @cds_and_tracks, $data;
-  }
-
-  my $pref_rs = $rs->search ({}, { columns => ['year'], prefetch => 'tracks' });
-
-  my @pref_cds_and_tracks;
-  for my $cd ($pref_rs->all) {
-    my $data = { $cd->get_columns };
-    for my $tr ($cd->tracks->all) {
-      push @{$data->{tracks}}, { $tr->get_columns };
-    }
-    push @pref_cds_and_tracks, $data;
-  }
-
-  is_deeply (
-    \@pref_cds_and_tracks,
-    \@cds_and_tracks,
-    'Correct collapsing on non-unique primary object'
-  );
-
-  is_deeply (
-    [ $pref_rs->search ({}, { result_class => 'DBIx::Class::ResultClass::HashRefInflator' })->all ],
-    \@cds_and_tracks,
-    'Correct HRI collapsing on non-unique primary object'
-  );
-
-}, 'weird collapse lives');
-
-
 lives_ok(sub {
   # test implicit prefetch as well
 
@@ -102,3 +49,29 @@ lives_ok(sub {
   is ($cd->artist->name, 'Random Boy Band', 'Artist object has correct name');
 
 }, 'implicit keyless prefetch works');
+
+# sane error
+throws_ok(
+  sub {
+    $schema->resultset('Track')->search({}, { join => { cd => 'artist' }, '+columns' => 'artist.name' } )->next;
+  },
+  qr|\QCan't inflate manual prefetch into non-existent relationship 'artist' from 'Track', check the inflation specification (columns/as) ending in 'artist.name'|,
+  'Sensible error message on mis-specified "as"',
+);
+
+# check complex limiting prefetch without the join-able columns
+{
+  my $pref_rs = $schema->resultset('Owners')->search({}, {
+    rows => 3,
+    offset => 1,
+    columns => 'name',  # only the owner name, still prefetch all the books
+    prefetch => 'books',
+  });
+
+  lives_ok {
+    is ($pref_rs->all, 1, 'Expected count of objects on limtied prefetch')
+  } "Complex limited prefetch works with non-selected join condition";
+}
+
+
+done_testing;