X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F746mssql.t;h=f5c00713628c73260529be039837f084acf254dc;hb=0ccd1cf55a1eb2f013af57ce7f3ba25004a49ea8;hp=7a2215fef800e4759ac0139f0678d62584dba174;hpb=c6fc5645c43466705c6302480706c751afc915f0;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/746mssql.t b/t/746mssql.t
index 7a2215f..f5c0071 100644
--- a/t/746mssql.t
+++ b/t/746mssql.t
@@ -2,15 +2,17 @@ use strict;
 use warnings;
 
 use Test::More;
+use Test::Exception;
 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 => 27;
 
 my $schema = DBICTest::Schema->connect($dsn, $user, $pass);
 
@@ -96,49 +98,57 @@ CREATE TABLE Owners (
 SQL
 
 });
-$schema->populate ('Owners', [
-  [qw/id  name  /],
-  [qw/1   wiggle/],
-  [qw/2   woggle/],
-  [qw/3   boggle/],
-  [qw/4   fREW/],
-  [qw/5   fRIOUX/],
-  [qw/6   fROOH/],
-  [qw/7   fRUE/],
-  [qw/8   fISMBoC/],
-  [qw/9   station/],
-  [qw/10   mirror/],
-  [qw/11   dimly/],
-  [qw/12   face_to_face/],
-  [qw/13   icarus/],
-  [qw/14   dream/],
-  [qw/15   dyrstyggyr/],
-]);
-
-$schema->populate ('BooksInLibrary', [
-  [qw/source  owner title   /],
-  [qw/Library 1     secrets0/],
-  [qw/Library 1     secrets1/],
-  [qw/Eatery  1     secrets2/],
-  [qw/Library 2     secrets3/],
-  [qw/Library 3     secrets4/],
-  [qw/Eatery  3     secrets5/],
-  [qw/Library 4     secrets6/],
-  [qw/Library 5     secrets7/],
-  [qw/Eatery  5     secrets8/],
-  [qw/Library 6     secrets9/],
-  [qw/Library 7     secrets10/],
-  [qw/Eatery  7     secrets11/],
-  [qw/Library 8     secrets12/],
-]);
+
+lives_ok ( sub {
+  $schema->populate ('Owners', [
+    [qw/id  name  /],
+    [qw/1   wiggle/],
+    [qw/2   woggle/],
+    [qw/3   boggle/],
+    [qw/4   fREW/],
+    [qw/5   fRIOUX/],
+    [qw/6   fROOH/],
+    [qw/7   fRUE/],
+    [qw/8   fISMBoC/],
+    [qw/9   station/],
+    [qw/10   mirror/],
+    [qw/11   dimly/],
+    [qw/12   face_to_face/],
+    [qw/13   icarus/],
+    [qw/14   dream/],
+    [qw/15   dyrstyggyr/],
+  ]);
+}, 'populate with PKs supplied ok' );
+
+lives_ok ( sub {
+  $schema->populate ('BooksInLibrary', [
+    [qw/source  owner title   /],
+    [qw/Library 1     secrets0/],
+    [qw/Library 1     secrets1/],
+    [qw/Eatery  1     secrets2/],
+    [qw/Library 2     secrets3/],
+    [qw/Library 3     secrets4/],
+    [qw/Eatery  3     secrets5/],
+    [qw/Library 4     secrets6/],
+    [qw/Library 5     secrets7/],
+    [qw/Eatery  5     secrets8/],
+    [qw/Library 6     secrets9/],
+    [qw/Library 7     secrets10/],
+    [qw/Eatery  7     secrets11/],
+    [qw/Library 8     secrets12/],
+  ]);
+}, 'populate without PKs supplied ok' );
 
 #
-# try a distinct + prefetch on tables with identically named columns
+# try a prefetch on tables with identically named columns
 #
 
+# set quote char - make sure things work while quoted
+$schema->storage->_sql_maker->{quote_char} = [qw/[ ]/];
+$schema->storage->_sql_maker->{name_sep} = '.';
+
 {
-$schema->debug (1);
-  # try a ->has_many direction (group_by is not possible on has_many with limit)
+  # try a ->has_many direction
   my $owners = $schema->resultset ('Owners')->search ({
       'books.id' => { '!=', undef }
     }, {
@@ -154,6 +164,24 @@ $schema->debug (1);
     local $TODO = 'limit past end of resultset problem';
     is ($owners->page(3)->all, 2, 'has_many prefetch returns correct number of rows');
     is ($owners->page(3)->count, 2, 'has-many prefetch returns correct count');
+    is ($owners->page(3)->count_rs->next, 2, 'has-many prefetch returns correct count_rs');
+
+    # make sure count does not become overly complex FIXME
+    is_same_sql_bind (
+      $owners->page(3)->count_rs->as_query,
+      '(
+        SELECT COUNT( * )
+          FROM (
+            SELECT TOP 3 [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] DESC
+          ) [count_subq]
+      )',
+      [],
+    );
   }
 
   # try a ->belongs_to direction (no select collapse, group_by should work)
@@ -162,8 +190,10 @@ $schema->debug (1);
     }, {
       distinct => 1,
       prefetch => 'owner',
-      order_by => 'name',
       rows     => 2,  # 3 results total
+      order_by => { -desc => 'owner' },
+      # there is no sane way to order by the right side of a grouped prefetch currently :(
+      #order_by => { -desc => 'owner.name' },
     });
 
 
@@ -174,7 +204,30 @@ $schema->debug (1);
     local $TODO = 'limit past end of resultset problem';
     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');
+    is ($books->page(2)->count_rs->next, 1, 'Prefetched grouped search returns correct count_rs');
+
+    # 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 [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] DESC
+          ) [count_subq]
+      )',
+      [
+        [ 'owner.name' => 'wiggle' ],
+        [ 'owner.name' => 'woggle' ],
+        [ 'source' => 'Library' ],
+      ],
+    );
   }
+
 }
 
 # clean up our mess