X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F746mssql.t;h=bae2e7c53d3cdb1b80686f323ae0b1da90a81e9b;hb=02d133f0f4c212e7842b869c26265f36cca18b77;hp=a9589868ecac8f78764dec5dcb3e9eaf63a79db1;hpb=64c7c000587e6e6dccb9fc6330a66dcebd1f3695;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/746mssql.t b/t/746mssql.t
index a958986..bae2e7c 100644
--- a/t/746mssql.t
+++ b/t/746mssql.t
@@ -134,9 +134,13 @@ $schema->populate ('BooksInLibrary', [
 ]);
 
 #
-# 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} = '.';
+
 {
   # try a ->has_many direction (group_by is not possible on has_many with limit)
   my $owners = $schema->resultset ('Owners')->search ({
@@ -162,13 +166,13 @@ $schema->populate ('BooksInLibrary', [
       '(
         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
+            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]
       )',
       [],
     );
@@ -200,13 +204,13 @@ $schema->populate ('BooksInLibrary', [
       '(
         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
+            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' ],