Merge 'subquery' into 'count_distinct'

Add subquery/from test by michaelr (copied from subquery branch r5742)

diff --git a/t/search/subquery.t b/t/search/subquery.t
index e99192b..c2a1bff 100644 (file)
--- a/t/search/subquery.t
+++ b/t/search/subquery.t
@@ -7,7 +7,7 @@ use Data::Dumper;
 
 use Test::More;
 
-plan ( tests => 7 );
+plan ( tests => 8 );
 
 use lib qw(t/lib);
 use DBICTest;
@@ -168,4 +168,24 @@ my $cdrs = $schema->resultset('CD');
   );
 }
 
+{
+  my $rs = $cdrs->search(
+    {},
+    {
+      alias => 'cd2',
+      from => [
+        { cd2 => $cdrs->search({ title => 'Thriller' })->as_query },
+      ],
+    },
+  );
+
+  my $arr = $rs->as_query;
+  my ($query, @bind) = @{$$arr};
+  is_same_sql_bind(
+    $query, \@bind,
+    "(SELECT cd2.cdid, cd2.artist, cd2.title, cd2.year, cd2.genreid, cd2.single_track FROM (SELECT me.cdid,me.artist,me.title,me.year,me.genreid,me.single_track FROM cd me WHERE title = ?) cd2)",
+    ['Thriller'],
+  );
+}
+
 __END__