From: Peter Rabbitson <ribasushi@cpan.org>
Date: Sat, 20 Jun 2009 22:18:33 +0000 (+0000)
Subject: Now really final
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=b2d16f1f55e1768a7690e312b97492fe7143391e;p=dbsrgits%2FDBIx-Class-Historic.git

Now really final
---

diff --git a/t/746mssql.t b/t/746mssql.t
index 7a2215f..a23898f 100644
--- a/t/746mssql.t
+++ b/t/746mssql.t
@@ -4,13 +4,14 @@ use warnings;
 use Test::More;
 use lib qw(t/lib);
 use DBICTest;
+use DBIC::SqlMakerTest;
 
 my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_MSSQL_ODBC_${_}" } qw/DSN USER PASS/};
 
 plan skip_all => 'Set $ENV{DBICTEST_MSSQL_ODBC_DSN}, _USER and _PASS to run this test'
   unless ($dsn && $user);
 
-plan tests => 21;
+plan tests => 23;
 
 my $schema = DBICTest::Schema->connect($dsn, $user, $pass);
 
@@ -137,7 +138,6 @@ $schema->populate ('BooksInLibrary', [
 #
 
 {
-$schema->debug (1);
   # try a ->has_many direction (group_by is not possible on has_many with limit)
   my $owners = $schema->resultset ('Owners')->search ({
       'books.id' => { '!=', undef }
@@ -156,6 +156,27 @@ $schema->debug (1);
     is ($owners->page(3)->count, 2, 'has-many prefetch returns correct count');
   }
 
+  # make sure count does not become overly complex FIXME
+  is_same_sql_bind (
+    $owners->page(2)->count_rs->as_query,
+    '(
+      SELECT COUNT( * )
+        FROM (
+          SELECT TOP 3 id
+            FROM (
+              SELECT TOP 6 me.id
+                FROM owners me
+                LEFT JOIN books books ON books.owner = me.id
+              WHERE ( books.id IS NOT NULL )
+              GROUP BY me.id
+              ORDER BY me.id ASC
+            ) AS inner_sel
+          ORDER BY id DESC
+        ) count_subq
+    )',
+    [],
+  );
+
   # try a ->belongs_to direction (no select collapse, group_by should work)
   my $books = $schema->resultset ('BooksInLibrary')->search ({
       'owner.name' => [qw/wiggle woggle/],
@@ -175,6 +196,32 @@ $schema->debug (1);
     is ($books->page(2)->all, 1, 'Prefetched grouped search returns correct number of rows');
     is ($books->page(2)->count, 1, 'Prefetched grouped search returns correct count');
   }
+
+  # make sure count does not become overly complex FIXME
+  is_same_sql_bind (
+    $books->page(2)->count_rs->as_query,
+    '(
+      SELECT COUNT( * )
+        FROM (
+          SELECT TOP 2 id
+            FROM (
+              SELECT TOP 4 me.id
+                FROM books me
+                JOIN owners owner ON owner.id = me.owner
+              WHERE ( ( ( owner.name = ? OR owner.name = ? ) AND source = ? ) )
+              GROUP BY me.id, me.source, me.owner, me.title, me.price, owner.id, owner.name
+              ORDER BY me.id ASC
+            ) AS inner_sel
+          ORDER BY id DESC
+        ) count_subq
+    )',
+    [
+      [ 'owner.name' => 'wiggle' ],
+      [ 'owner.name' => 'woggle' ],
+      [ 'source' => 'Library' ],
+    ],
+  );
+
 }
 
 # clean up our mess