X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fresultset%2Fas_query.t;h=0e770784042c0b4f409d51a0add1524a7702270b;hb=0e773352a;hp=b4fa42228f073c46e20b4fb42066d5205f23757f;hpb=152d414da2432cc95b79302a70a59b4cca4f5338;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/resultset/as_query.t b/t/resultset/as_query.t
index b4fa422..0e77078 100644
--- a/t/resultset/as_query.t
+++ b/t/resultset/as_query.t
@@ -1,65 +1,70 @@
-#!/usr/bin/perl
-
 use strict;
-use warnings FATAL => 'all';
+use warnings;
 
 use Test::More;
+
+plan ( tests => 5 );
+
 use lib qw(t/lib);
 use DBICTest;
 use DBIC::SqlMakerTest;
 
-plan tests => 4;
-
-my $schema	= DBICTest->init_schema();
-my $art_rs	= $schema->resultset('Artist');
+my $schema = DBICTest->init_schema();
+my $art_rs = $schema->resultset('Artist');
+my $cdrs = $schema->resultset('CD');
 
 {
-  my $arr = $art_rs->as_query;
-  my ($query, @bind) = @$arr;
-
   is_same_sql_bind(
-    $query, \@bind,
-    "SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me", [],
+    $art_rs->as_query,
+    "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me)", [],
   );
 }
 
 $art_rs = $art_rs->search({ name => 'Billy Joel' });
 
-{
-  my $arr = $art_rs->as_query;
-  my ($query, @bind) = @$arr;
+my $name_resolved_bind = [
+  { sqlt_datatype => 'varchar', sqlt_size  => 100, dbic_colname => 'name' }
+    => 'Billy Joel'
+];
 
+{
   is_same_sql_bind(
-    $query, \@bind,
-    "SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( name = ? )",
-    [ [ name => 'Billy Joel' ] ],
+    $art_rs->as_query,
+    "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( name = ? ))",
+    [ $name_resolved_bind ],
   );
 }
 
 $art_rs = $art_rs->search({ rank => 2 });
 
-{
-  my $arr = $art_rs->as_query;
-  my ($query, @bind) = @$arr;
+my $rank_resolved_bind = [
+  { sqlt_datatype => 'integer', dbic_colname => 'rank' }
+    => 2
+];
 
+{
   is_same_sql_bind(
-    $query, \@bind,
-    "SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) )",
-    [ [ rank => 2 ], [ name => 'Billy Joel' ] ],
+    $art_rs->as_query,
+    "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) ) )",
+    [ $rank_resolved_bind, $name_resolved_bind ],
   );
 }
 
 my $rscol = $art_rs->get_column( 'charfield' );
 
 {
-  my $arr = $rscol->as_query;
-  my ($query, @bind) = @$arr;
-
   is_same_sql_bind(
-    $query, \@bind,
-    "SELECT me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) )",
-    [ [ rank => 2 ], [ name => 'Billy Joel' ] ],
+    $rscol->as_query,
+    "(SELECT me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) ) )",
+    [ $rank_resolved_bind, $name_resolved_bind ],
   );
 }
 
-__END__
+{
+  my $rs = $schema->resultset("CD")->search(
+    { 'artist.name' => 'Caterwauler McCrae' },
+    { join => [qw/artist/]}
+  );
+  my $subsel_rs = $schema->resultset("CD")->search( { cdid => { IN => $rs->get_column('cdid')->as_query } } );
+  is($subsel_rs->count, $rs->count, 'Subselect on PK got the same row count');
+}