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

diff --git a/t/resultset/as_query.t b/t/resultset/as_query.t
index 2929e7c..7f4c738 100644
--- a/t/resultset/as_query.t
+++ b/t/resultset/as_query.t
@@ -6,12 +6,13 @@ use warnings FATAL => 'all';
 use Data::Dumper;
 
 use Test::More;
+
+plan ( tests => 4 );
+
 use lib qw(t/lib);
 use DBICTest;
 use DBIC::SqlMakerTest;
 
-plan tests => 5;
-
 my $schema = DBICTest->init_schema();
 my $art_rs = $schema->resultset('Artist');
 my $cdrs = $schema->resultset('CD');
@@ -22,7 +23,7 @@ my $cdrs = $schema->resultset('CD');
 
   is_same_sql_bind(
     $query, \@bind,
-    "SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me", [],
+    "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me)", [],
   );
 }
 
@@ -34,7 +35,7 @@ $art_rs = $art_rs->search({ name => 'Billy Joel' });
 
   is_same_sql_bind(
     $query, \@bind,
-    "SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( name = ? )",
+    "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( name = ? ))",
     [ [ name => 'Billy Joel' ] ],
   );
 }
@@ -42,12 +43,12 @@ $art_rs = $art_rs->search({ name => 'Billy Joel' });
 $art_rs = $art_rs->search({ rank => 2 });
 
 {
-  my $arr = $art_rs->as_subselect;
+  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 WHERE ( ( rank = ? ) AND ( name = ? ) ) )",
+    "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) ) )",
     [ [ rank => 2 ], [ name => 'Billy Joel' ] ],
   );
 }
@@ -55,29 +56,14 @@ $art_rs = $art_rs->search({ rank => 2 });
 my $rscol = $art_rs->get_column( 'charfield' );
 
 {
-  my $arr = $rscol->as_subselect;
+  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' ] ],
-  );
-}
-
-{
-  my $cdrs2 = $cdrs->search({
-    artist_id => { '=' => $art_rs->search({}, { rows => 1 })->get_column( 'id' )->as_subselect },
-  });
-
-  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 )",
+    "(SELECT me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) ) )",
     [ [ rank => 2 ], [ name => 'Billy Joel' ] ],
   );
-warn Dumper $cdrs2->as_sql;
 }
 
 __END__