Massive rewrite of bind handling, and overall simplification of ::Storage::DBI

[dbsrgits/DBIx-Class.git] / t / resultset / as_query.t

diff --git a/t/resultset/as_query.t b/t/resultset/as_query.t
index 2929e7c..0e77078 100644 (file)
--- a/t/resultset/as_query.t
+++ b/t/resultset/as_query.t
@@ -1,83 +1,70 @@
-#!/usr/bin/perl
-
 use strict;
-use warnings FATAL => 'all';
-
-use Data::Dumper;
+use warnings;
 
 use Test::More;
+
+plan ( tests => 5 );
+
 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');
 
 {
-  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_subselect;
-  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_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' ] ],
+    $rscol->as_query,
+    "(SELECT me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) ) )",
+    [ $rank_resolved_bind, $name_resolved_bind ],
   );
 }
 
 {
-  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 )",
-    [ [ rank => 2 ], [ name => 'Billy Joel' ] ],
+  my $rs = $schema->resultset("CD")->search(
+    { 'artist.name' => 'Caterwauler McCrae' },
+    { join => [qw/artist/]}
   );
-warn Dumper $cdrs2->as_sql;
+  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');
 }
-
-__END__