X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F88result_set_column.t;h=615d8aa4bd0e05d379f0428daa86b88b4dcee2ec;hb=0bf5c67eb6282d2efdd43652643a3f3d80ed7e66;hp=066d4eeef668aa17f6d31bd201f13afcb37e11fa;hpb=01dc6781d8cbc3466dd7ed15eb26999b0a91759a;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/t/88result_set_column.t b/t/88result_set_column.t
index 066d4ee..615d8aa 100644
--- a/t/88result_set_column.t
+++ b/t/88result_set_column.t
@@ -1,16 +1,22 @@
 use strict;
-use warnings;  
+use warnings;
 
 use Test::More;
+use Test::Warn;
 use Test::Exception;
 use lib qw(t/lib);
 use DBICTest;
 
 my $schema = DBICTest->init_schema();
 
-plan tests => 21;
+my $rs = $schema->resultset("CD");
 
-my $rs = $schema->resultset("CD")->search({}, { order_by => 'cdid' });
+cmp_ok (
+  $rs->count,
+    '!=',
+  $rs->search ({}, {columns => ['year'], distinct => 1})->count,
+  'At least one year is the same in rs'
+);
 
 my $rs_title = $rs->get_column('title');
 my $rs_year = $rs->get_column('year');
@@ -28,12 +34,23 @@ is($rs_title->min, 'Caterwaulin\' Blues', "min okay for title");
 
 cmp_ok($rs_year->sum, '==', 9996, "three artists returned");
 
-my $reset_ret = $rs_year->reset;
+$rs_year->reset;
 is($rs_year->next, 1999, "reset okay");
-is($reset_ret, undef, 'reset returns undef');
 
 is($rs_year->first, 1999, "first okay");
 
+warnings_exist (sub {
+  is($rs_year->single, 1999, "single okay");
+}, qr/Query returned more than one row/, 'single warned');
+
+
+# test distinct propagation
+is_deeply (
+  [$rs->search ({}, { distinct => 1 })->get_column ('year')->all],
+  [$rs_year->func('distinct')],
+  'distinct => 1 is passed through properly',
+);
+
 # test +select/+as for single column
 my $psrs = $schema->resultset('CD')->search({},
     {
@@ -95,3 +112,5 @@ is_deeply (
   [ $rs->get_column ('cdid')->all ],
   'prefetch properly collapses amount of rows from get_column',
 );
+
+done_testing;