minor fix to last committed test

[dbsrgits/DBIx-Class.git] / t / 76select.t

diff --git a/t/76select.t b/t/76select.t
index 0c85795..7560d2c 100644 (file)
--- a/t/76select.t
+++ b/t/76select.t
@@ -9,7 +9,7 @@ use DBIC::SqlMakerTest;
 
 my $schema = DBICTest->init_schema();
 
-plan tests => 21;
+plan tests => 24;
 
 my $rs = $schema->resultset('CD')->search({},
     {
@@ -64,6 +64,7 @@ my $cds = $schema->resultset ('CD')->search ({}, { order_by => 'me.cdid'}); # ma
 cmp_ok ($cds->count, '>', 2, 'Initially populated with more than 2 CDs');
 
 my $table = $cds->result_source->name;
+$table = $$table if ref $table eq 'SCALAR';
 my $subsel = $cds->search ({}, {
     columns => [qw/cdid title/],
     from => \ "(SELECT cdid, title FROM $table LIMIT 2) me",
@@ -84,11 +85,8 @@ $rs = $schema->resultset('CD')->search({},
     }
 );
 
-my @query = @${$rs->as_query};
-
 is_same_sql_bind (
-  @query,
-  [],
+  $rs->as_query,
   '(SELECT me.cdid, me.title, artist.name FROM cd me  JOIN artist artist ON artist.artistid = me.artist)',
   [],
   'Use of columns attribute results in proper sql'
@@ -102,13 +100,9 @@ lives_ok(sub {
   $rs->first->get_column('title')
 }, 'columns 2nd rscolumn present');
 
-TODO: {
-  local $TODO = "Need to remove '.' from accessors";
-  # I think this is too much dwis  #ribasushi
-  lives_ok(sub {
-    $rs->first->get_column("artist.name") 
-  }, 'columns 3rd rscolumn present'); 
-}
+lives_ok(sub {
+  $rs->first->artist->get_column('name') 
+}, 'columns 3rd rscolumn present'); 
 
 
 
@@ -119,11 +113,8 @@ $rs = $schema->resultset('CD')->search({},
     }
 );
 
-@query = @${$rs->as_query};
-
 is_same_sql_bind (
-  @query,
-  [],
+  $rs->as_query,
   '(SELECT me.cdid, me.artist, me.title, me.year, me.genreid, me.single_track, me.cdid, me.title, artist.name FROM cd me  JOIN artist artist ON artist.artistid = me.artist)',
   [],
   'Use of columns attribute results in proper sql'
@@ -137,10 +128,71 @@ lives_ok(sub {
   $rs->first->get_column('title')
 }, 'columns 2nd rscolumn present');
 
+lives_ok(sub {
+  $rs->first->artist->get_column('name')
+}, 'columns 3rd rscolumn present');
+
+
+$rs = $schema->resultset('CD')->search({'tracks.position' => { -in => [2] } },
+  {
+    join => 'tracks',
+    columns => [qw/me.cdid me.title/],
+    '+select' => ['tracks.position'],
+    '+as' => ['track_position'],
+
+    # get a hashref of CD1 only (the first with a second track)
+    result_class => 'DBIx::Class::ResultClass::HashRefInflator',
+    order_by => 'cdid',
+    rows => 1,
+  }
+);
+
+is_deeply (
+  $rs->single,
+  {
+    cdid => 1,
+    track_position => 2,
+    title => 'Spoonful of bees',
+  },
+  'limited prefetch via column works on a multi-relationship',
+);
+
+my $sub_rs = $rs->search ({},
+  {
+    columns => [qw/artist tracks.trackid/],    # columns should not be merged but override $rs columns
+    '+select' => ['tracks.title'],
+    '+as' => ['tracks.title'],
+  }
+);
+
+is_deeply (
+  $sub_rs->single,
+  {
+    artist => 1,
+    track_position => 2,
+    tracks =>
+      {
+        trackid => 17,
+        title => 'Apiary',
+      },
+  },
+  'columns/select/as fold properly on sub-searches',
+);
+
 TODO: {
-  local $TODO = "Need to remove '.' from accessors";
-  # I think this is too much dwis  #ribasushi
-  lives_ok(sub {
-    $rs->first->get_column("artist.name")
-  }, 'columns 3rd rscolumn present');
+  local $TODO = "Multi-collapsing still doesn't work right - HRI should be getting an arrayref, not an individual hash";
+  is_deeply (
+    $sub_rs->single,
+    {
+      artist => 1,
+      track_position => 2,
+      tracks => [
+        {
+          trackid => 17,
+          title => 'Apiary',
+        },
+      ],
+    },
+    'columns/select/as fold properly on sub-searches',
+  );
 }