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=d5baabff10e790e4bb52f4a2b7a760cdb56bdcff;hpb=59af6677aa817effed8a69dcafddb96c84d13203;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/resultset/as_query.t b/t/resultset/as_query.t
index d5baabf..0e77078 100644
--- a/t/resultset/as_query.t
+++ b/t/resultset/as_query.t
@@ -1,43 +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 => 6;
-
-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( $query, "SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me" );
-  is_deeply( \@bind, [] );
+  is_same_sql_bind(
+    $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( $query, "SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( name = ? )" );
-  is_deeply( \@bind, [ [ name => 'Billy Joel' ] ] );
+{
+  is_same_sql_bind(
+    $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 $rank_resolved_bind = [
+  { sqlt_datatype => 'integer', dbic_colname => 'rank' }
+    => 2
+];
+
 {
-  my $arr = $art_rs->as_query;
-  my ($query, @bind) = @$arr;
+  is_same_sql_bind(
+    $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' );
 
-  is( $query, "SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) )" );
-  is_deeply( \@bind, [ [ rank => 2 ], [ name => 'Billy Joel' ] ] );
+{
+  is_same_sql_bind(
+    $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');
+}