Methods update/delete on resultset use now new as_query method to updated/delete...

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

diff --git a/t/resultset/as_query.t b/t/resultset/as_query.t
index b4fa422..5e9a7fe 100644 (file)
--- a/t/resultset/as_query.t
+++ b/t/resultset/as_query.t
@@ -3,23 +3,27 @@
 use strict;
 use warnings FATAL => 'all';
 
+use Data::Dumper;
+
 use Test::More;
+
+plan ( tests => 6 );
+
 use lib qw(t/lib);
 use DBICTest;
 use DBIC::SqlMakerTest;
 
-plan tests => 4;
-
-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_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)", [],
   );
 }
 
@@ -27,11 +31,11 @@ $art_rs = $art_rs->search({ name => 'Billy Joel' });
 
 {
   my $arr = $art_rs->as_query;
-  my ($query, @bind) = @$arr;
+  my ($query, @bind) = @{$$arr};
 
   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' ] ],
   );
 }
@@ -40,11 +44,11 @@ $art_rs = $art_rs->search({ rank => 2 });
 
 {
   my $arr = $art_rs->as_query;
-  my ($query, @bind) = @$arr;
+  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' ] ],
   );
 }
@@ -53,13 +57,29 @@ my $rscol = $art_rs->get_column( 'charfield' );
 
 {
   my $arr = $rscol->as_query;
-  my ($query, @bind) = @$arr;
+  my ($query, @bind) = @{$$arr};
 
   is_same_sql_bind(
     $query, \@bind,
-    "SELECT me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) )",
+    "(SELECT me.charfield FROM artist me WHERE ( ( ( rank = ? ) AND ( name = ? ) ) ) )",
     [ [ rank => 2 ], [ name => 'Billy Joel' ] ],
   );
 }
 
+{
+    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');
+}
+
 __END__