From: Matt S Trout <mst@shadowcat.co.uk>
Date: Thu, 16 Aug 2012 16:33:17 +0000 (+0100)
Subject: fixup rno.t
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=bf4878bbdf9a658a32566cac72f303be0bcaffc6;p=dbsrgits%2FDBIx-Class-Historic.git

fixup rno.t
---

diff --git a/t/sqlmaker/limit_dialects/rno.t b/t/sqlmaker/limit_dialects/rno.t
index 73d8f34..15e33b4 100644
--- a/t/sqlmaker/limit_dialects/rno.t
+++ b/t/sqlmaker/limit_dialects/rno.t
@@ -58,7 +58,7 @@ $schema->storage->_sql_maker->quote_char ([qw/ [ ] /]);
 $schema->storage->_sql_maker->name_sep ('.');
 
 my $rs_selectas_rel = $schema->resultset ('BooksInLibrary')->search ({}, {
-  '+select' => ['owner.name'],
+  '+select' => [{ -as => 'owner_name', '' => 'owner.name' }],
   '+as' => ['owner_name'],
   join => 'owner',
   rows => 1,
@@ -98,8 +98,8 @@ my $subq = $schema->resultset('Owners')->search({
 
 my $rs_selectas_rel = $schema->resultset('BooksInLibrary')->search ({}, {
   columns => [
-     { owner_name => 'owner.name' },
-     { owner_books => $subq->as_query },
+     { owner_name => { -as => 'owner_name', '' => 'owner.name' } },
+     { owner_books => { -as => 'owner_books', '' => $subq->as_query } },
   ],
   join => 'owner',
   rows => 1,
@@ -111,12 +111,12 @@ is_same_sql_bind(
   '(
     SELECT [owner_name], [owner_books]
       FROM (
-        SELECT [owner_name], [owner_books], ROW_NUMBER() OVER( ORDER BY [ORDER__BY__001] ) AS [rno__row__index]
+        SELECT [owner_name], [owner_books], ROW_NUMBER() OVER( ORDER BY [me].[id] ) AS [rno__row__index]
           FROM (
             SELECT  [owner].[name] AS [owner_name],
               ( SELECT COUNT( * ) FROM [owners] [owner]
                 WHERE [count].[id] = [owner].[id] and [count].[name] = ? ) AS [owner_books],
-              [me].[id] AS [ORDER__BY__001]
+              [me].[id]
                 FROM [books] [me]
                 JOIN [owners] [owner] ON [owner].[id] = [me].[owner]
             WHERE ( [source] = ? )
@@ -139,8 +139,8 @@ my $subq = $schema->resultset('Owners')->search({
 
 my $rs_selectas_rel = $schema->resultset('BooksInLibrary')->search ({}, {
   columns => [
-     { owner_name => 'owner.name' },
-     { owner_books => $subq->as_query },
+     { owner_name => { -as => 'owner_name', '' => 'owner.name' } },
+     { owner_books => { -as => 'owner_books', '' => $subq->as_query } },
   ],
   join => 'owner',
   rows => 1,
@@ -201,9 +201,9 @@ is_same_sql_bind(
    SELECT [me].[id], [me].[owner], ROW_NUMBER() OVER(  ) AS [rno__row__index] FROM (
      SELECT [me].[id], [me].[owner]
      FROM [books] [me]
-     WHERE ( ( (EXISTS (
+     WHERE ( EXISTS (
        SELECT COUNT( * ) FROM [owners] [owner] WHERE ( [books].[owner] = [owner].[id] )
-     )) AND [source] = ? ) )
+     ) AND [source] = ? )
    ) [me]
  ) [me] WHERE [rno__row__index] >= ? AND [rno__row__index] <= ?
  )',