Retire DBIC/SqlMakerTest.pm now that SQLA::Test provides the same function

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

diff --git a/t/resultset/as_subselect_rs.t b/t/resultset/as_subselect_rs.t
index 1453f63..6d75977 100644 (file)
--- a/t/resultset/as_subselect_rs.t
+++ b/t/resultset/as_subselect_rs.t
@@ -5,8 +5,7 @@ use Test::More;
 use Test::Exception;
 
 use lib qw(t/lib);
-use DBICTest;
-use DBIC::SqlMakerTest;
+use DBICTest ':DiffSQL';
 
 my $schema = DBICTest->init_schema();
 
@@ -27,7 +26,7 @@ my $book_rs = $schema->resultset ('BooksInLibrary')->search ({}, { join => 'owne
 
 is_same_sql_bind (
   $book_rs->as_subselect_rs->as_query,
-  '(SELECT me.id, me.source, me.owner, me.title, me.price 
+  '(SELECT me.id, me.source, me.owner, me.title, me.price
       FROM (
         SELECT me.id, me.source, me.owner, me.title, me.price
           FROM books me
@@ -35,8 +34,37 @@ is_same_sql_bind (
         WHERE ( source = ? )
       ) me
   )',
-  [ [ source => 'Library' ] ],
+  [ [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'source' }
+      => 'Library' ] ],
   'Resultset-class attributes do not seep outside of the subselect',
 );
 
+is_same_sql_bind(
+  $schema->resultset('CD')->search ({}, {
+    rows => 2,
+    join => [ 'genre', { artist => 'cds' } ],
+    distinct => 1,
+    columns => {
+      title => 'me.title',
+      artist__name => 'artist.name',
+      genre__name => 'genre.name',
+      cds_for_artist => \ '(SELECT COUNT(*) FROM cds WHERE cd.artist = artist.id)',
+    },
+    order_by => { -desc => 'me.year' },
+  })->count_rs->as_query,
+  '(
+    SELECT COUNT( * )
+      FROM (
+        SELECT artist.name AS artist__name, (SELECT COUNT(*) FROM cds WHERE cd.artist = artist.id), genre.name AS genre__name, me.title, me.year
+          FROM cd me
+          LEFT JOIN genre genre
+            ON genre.genreid = me.genreid
+          JOIN artist artist ON artist.artistid = me.artist
+        GROUP BY artist.name, (SELECT COUNT(*) FROM cds WHERE cd.artist = artist.id), genre.name, me.title, me.year
+        LIMIT ?
+      ) me
+  )',
+  [ [{ sqlt_datatype => 'integer' } => 2 ] ],
+);
+
 done_testing;