X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fresultset%2Fas_query.t;h=2929e7c1e75bbf017400cea4542a111b98c19b52;hb=36d80a6bc4fd382919d7f74ec53aec5c2da5fca2;hp=d5baabff10e790e4bb52f4a2b7a760cdb56bdcff;hpb=59af6677aa817effed8a69dcafddb96c84d13203;p=dbsrgits%2FDBIx-Class-Historic.git

diff --git a/t/resultset/as_query.t b/t/resultset/as_query.t
index d5baabf..2929e7c 100644
--- a/t/resultset/as_query.t
+++ b/t/resultset/as_query.t
@@ -3,41 +3,81 @@
 use strict;
 use warnings FATAL => 'all';
 
+use Data::Dumper;
+
 use Test::More;
 use lib qw(t/lib);
 use DBICTest;
+use DBIC::SqlMakerTest;
 
-plan tests => 6;
+plan tests => 5;
 
-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;
+  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(
+    $query, \@bind,
+    "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 ($query, @bind) = @{$$arr};
 
-  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(
+    $query, \@bind,
+    "SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( name = ? )",
+    [ [ name => 'Billy Joel' ] ],
+  );
 }
 
 $art_rs = $art_rs->search({ rank => 2 });
 
 {
-  my $arr = $art_rs->as_query;
-  my ($query, @bind) = @$arr;
+  my $arr = $art_rs->as_subselect;
+  my ($query, @bind) = @{$$arr};
+
+  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' ] ],
+  );
+}
+
+my $rscol = $art_rs->get_column( 'charfield' );
+
+{
+  my $arr = $rscol->as_subselect;
+  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' ] ],
+  );
+}
+
+{
+  my $cdrs2 = $cdrs->search({
+    artist_id => { '=' => $art_rs->search({}, { rows => 1 })->get_column( 'id' )->as_subselect },
+  });
 
-  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' ] ] );
+  my $arr = $cdrs2->as_query;
+  my ($query, @bind) = @{$$arr};
+  is_same_sql_bind(
+    $query, \@bind,
+    "SELECT me.cdid,me.artist,me.title,me.year,me.genreid,me.single_track FROM cd me WHERE artist_id = ( SELECT id FROM artist me WHERE ( rank = ? ) AND ( name = ? ) LIMIT 1 )",
+    [ [ rank => 2 ], [ name => 'Billy Joel' ] ],
+  );
+warn Dumper $cdrs2->as_sql;
 }
 
 __END__