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 5e9a7fe..0e77078 100644 (file)
--- a/t/resultset/as_query.t
+++ b/t/resultset/as_query.t
@@ -1,13 +1,9 @@
-#!/usr/bin/perl
-
 use strict;
-use warnings FATAL => 'all';
-
-use Data::Dumper;
+use warnings;
 
 use Test::More;
 
-plan ( tests => 6 );
+plan ( tests => 5 );
 
 use lib qw(t/lib);
 use DBICTest;
@@ -18,68 +14,57 @@ 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,
+    $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,
+    $art_rs->as_query,
     "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( name = ? ))",
-    [ [ name => 'Billy Joel' ] ],
+    [ $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,
+    $art_rs->as_query,
     "(SELECT me.artistid, me.name, me.rank, me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) ) )",
-    [ [ rank => 2 ], [ name => 'Billy Joel' ] ],
+    [ $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,
+    $rscol->as_query,
     "(SELECT me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) ) )",
-    [ [ rank => 2 ], [ name => 'Billy Joel' ] ],
+    [ $rank_resolved_bind, $name_resolved_bind ],
   );
 }
 
 {
-    my $rs = $schema->resultset("CD")->search(
-        { 'artist.name' => 'Caterwauler McCrae' },
-        { join => [qw/artist/]}
-    );
-    my $query = $rs->get_column('cdid')->as_query({ skip_parens => 1 });
-    my ($sql, @bind) = @{$$query};
-    is_same_sql_bind(
-      $sql, \@bind,
-        'SELECT me.cdid FROM cd me  JOIN artist artist ON artist.artistid = me.artist WHERE ( artist.name = ? )',
-        [['artist.name' => 'Caterwauler McCrae']]
-    );
-    my $subsel_rs = $schema->resultset("CD")->search( { cdid => { IN => $query } } );
-    cmp_ok($subsel_rs->count, '==', $rs->count, 'Subselect on PK got the same row count');
+  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');
 }
-
-__END__