X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2F746mssql.t;h=271574a29a46f9ae1fa21298cdebaaf32a9972d4;hb=f895c500473b77db4ecf185ed21530b821a14ed4;hp=57c44fbc60c71f5f63f7950a6094a0712b68a0f4;hpb=5e7249645ea75d5a9d25f1fdf8a42e0536b03f4e;p=dbsrgits%2FDBIx-Class.git

diff --git a/t/746mssql.t b/t/746mssql.t
index 57c44fb..271574a 100644
--- a/t/746mssql.t
+++ b/t/746mssql.t
@@ -11,11 +11,6 @@ plan skip_all => 'Test needs ' . DBIx::Class::Optional::Dependencies->req_missin
 
 use lib qw(t/lib);
 use DBICTest;
-use DBIC::SqlMakerTest;
-use DBIx::Class::SQLMaker::LimitDialects;
-
-my $OFFSET = DBIx::Class::SQLMaker::LimitDialects->__offset_bindtype;
-my $TOTAL  = DBIx::Class::SQLMaker::LimitDialects->__total_bindtype;
 
 my ($dsn, $user, $pass) = @ENV{map { "DBICTEST_MSSQL_ODBC_${_}" } qw/DSN USER PASS/};
 
@@ -237,6 +232,10 @@ SQL
         ? ('RowNumberOver')
         : ()
       ,
+      ($schema->storage->_server_info->{normalized_dbms_version} || 0 ) >= 11
+        ? ('OffsetFetchNext')
+        : ()
+      ,
     ) {
       for my $quoted (0, 1) {
 
@@ -336,20 +335,13 @@ SQL
           is ($limited_rs->count, 6, "$test_type: Correct count of limited right-sorted joined resultset");
           is ($limited_rs->count_rs->next, 6, "$test_type: Correct count_rs of limited right-sorted joined resultset");
 
-          my $queries;
-          my $orig_debug = $schema->storage->debug;
-          $schema->storage->debugcb(sub { $queries++; });
-          $schema->storage->debug(1);
-
-          is_deeply (
-            [map { $_->owner->name } ($limited_rs->all) ],
-            [@owner_names[2 .. 7]],
-            "$test_type: Prefetch-limited rows were properly ordered"
-          );
-          is ($queries, 1, "$test_type: Only one query with prefetch");
-
-          $schema->storage->debugcb(undef);
-          $schema->storage->debug($orig_debug);
+          $schema->is_executed_querycount( sub {
+            is_deeply (
+              [map { $_->owner->name } ($limited_rs->all) ],
+              [@owner_names[2 .. 7]],
+              "$test_type: Prefetch-limited rows were properly ordered"
+            );
+          }, 1, "$test_type: Only one query with prefetch" );
 
           is_deeply (
             [map { $_->name } ($limited_rs->search_related ('owner')->all) ],
@@ -373,77 +365,6 @@ SQL
           },
         );
 
-        is_same_sql_bind (
-          $owners->page(3)->as_query,
-          $dialect eq 'Top'
-            ? '(
-              SELECT TOP 2147483647 [me].[id], [me].[name],
-                                    [books].[id], [books].[source], [books].[owner], [books].[title], [books].[price]
-                FROM (
-                  SELECT TOP 2147483647 [me].[id], [me].[name]
-                    FROM (
-                      SELECT TOP 3 [me].[id], [me].[name], [ORDER__BY__001]
-                        FROM (
-                          SELECT TOP 9 [me].[id], [me].[name], name + ? AS [ORDER__BY__001]
-                            FROM [owners] [me]
-                            LEFT JOIN [books] [books]
-                              ON [books].[owner] = [me].[id]
-                          WHERE [books].[id] IS NOT NULL AND [me].[name] != ?
-                          GROUP BY [me].[id], [me].[name]
-                          ORDER BY name + ? ASC, [me].[id]
-                        ) [me]
-                      ORDER BY [ORDER__BY__001] DESC, [me].[id] DESC
-                    ) [me]
-                  ORDER BY [ORDER__BY__001] ASC, [me].[id]
-                ) [me]
-                LEFT JOIN [books] [books]
-                  ON [books].[owner] = [me].[id]
-              WHERE [books].[id] IS NOT NULL AND [me].[name] != ?
-              ORDER BY name + ? ASC, [me].[id]
-            )'
-            : '(
-              SELECT TOP 2147483647 [me].[id], [me].[name],
-                                    [books].[id], [books].[source], [books].[owner], [books].[title], [books].[price]
-                FROM (
-                  SELECT TOP 2147483647 [me].[id], [me].[name]
-                    FROM (
-                      SELECT [me].[id], [me].[name],
-                             ROW_NUMBER() OVER( ORDER BY [ORDER__BY__001] ASC, [me].[id] ) AS [rno__row__index]
-                        FROM (
-                          SELECT [me].[id], [me].[name], name + ? AS [ORDER__BY__001]
-                            FROM [owners] [me]
-                            LEFT JOIN [books] [books]
-                              ON [books].[owner] = [me].[id]
-                          WHERE [books].[id] IS NOT NULL AND [me].[name] != ?
-                          GROUP BY [me].[id], [me].[name]
-                        ) [me]
-                    ) [me]
-                  WHERE [rno__row__index] >= ? AND [rno__row__index] <= ?
-                ) [me]
-                LEFT JOIN [books] [books]
-                  ON [books].[owner] = [me].[id]
-              WHERE [books].[id] IS NOT NULL AND [me].[name] != ?
-              ORDER BY name + ? ASC, [me].[id]
-            )'
-          ,
-          [
-            [ { dbic_colname => 'test' }
-              => 'xxx' ],
-            [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'me.name' }
-              => 'somebogusstring' ],
-
-            ($dialect eq 'Top'
-              ? [ { dbic_colname => 'test' } => 'xxx' ]  # the extra re-order bind
-              : ([ $OFFSET => 7 ], [ $TOTAL => 9 ]) # parameterised RNO
-            ),
-
-            [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'me.name' }
-              => 'somebogusstring' ],
-            [ { dbic_colname => 'test' }
-              => 'xxx' ],
-          ],
-        ) if $quoted;
-
         is ($owners->page(1)->all, 3, "$test_type: has_many prefetch returns correct number of rows");
         is ($owners->page(1)->count, 3, "$test_type: has-many prefetch returns correct count");
 
@@ -471,88 +392,6 @@ SQL
           },
         );
 
-        is_same_sql_bind (
-          $books->page(3)->as_query,
-          $dialect eq 'Top'
-            ? '(
-              SELECT TOP 2147483647 [me].[id], [me].[source], [me].[owner], [me].[title], [me].[price],
-                                    [owner].[id], [owner].[name]
-                FROM (
-                  SELECT TOP 2147483647 [me].[id], [me].[source], [me].[owner], [me].[title], [me].[price]
-                    FROM (
-                      SELECT TOP 2 [me].[id], [me].[source], [me].[owner], [me].[title], [me].[price]
-                        FROM (
-                          SELECT TOP 6 [me].[id], [me].[source], [me].[owner], [me].[title], [me].[price]
-                            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]
-                          HAVING 1 = ?
-                          ORDER BY [me].[owner] DESC, [me].[id]
-                        ) [me]
-                      ORDER BY [me].[owner] ASC, [me].[id] DESC
-                    ) [me]
-                  ORDER BY [me].[owner] DESC, [me].[id]
-                ) [me]
-                JOIN [owners] [owner]
-                  ON [owner].[id] = [me].[owner]
-              WHERE ( [owner].[name] = ? OR [owner].[name] = ? ) AND [source] = ?
-              ORDER BY [me].[owner] DESC, [me].[id]
-            )'
-            : '(
-              SELECT TOP 2147483647 [me].[id], [me].[source], [me].[owner], [me].[title], [me].[price],
-                                    [owner].[id], [owner].[name]
-                FROM (
-                  SELECT TOP 2147483647 [me].[id], [me].[source], [me].[owner], [me].[title], [me].[price]
-                    FROM (
-                      SELECT [me].[id], [me].[source], [me].[owner], [me].[title], [me].[price],
-                             ROW_NUMBER() OVER( ORDER BY [me].[owner] DESC, [me].[id] ) AS [rno__row__index]
-                        FROM (
-                          SELECT [me].[id], [me].[source], [me].[owner], [me].[title], [me].[price]
-                            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]
-                          HAVING 1 = ?
-                        ) [me]
-                    ) [me]
-                  WHERE [rno__row__index] >= ? AND [rno__row__index] <= ?
-                ) [me]
-                JOIN [owners] [owner]
-                  ON [owner].[id] = [me].[owner]
-              WHERE ( [owner].[name] = ? OR [owner].[name] = ? ) AND [source] = ?
-              ORDER BY [me].[owner] DESC, [me].[id]
-            )'
-          ,
-          [
-            # inner
-            [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'owner.name' }
-              => 'wiggle' ],
-            [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'owner.name' }
-              => 'woggle' ],
-            [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'source' }
-              => 'Library' ],
-            [ { dbic_colname => 'test' }
-              => '1' ],
-
-            # top(?)
-            $dialect eq 'Top'
-              ? ()
-              : ( [ $OFFSET => 5 ], [ $TOTAL => 6 ] )
-            ,
-
-            # outer
-            [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'owner.name' }
-              => 'wiggle' ],
-            [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'owner.name' }
-              => 'woggle' ],
-            [ { sqlt_datatype => 'varchar', sqlt_size => 100, dbic_colname => 'source' }
-              => 'Library' ],
-          ],
-        ) if $quoted;
-
         is ($books->page(1)->all, 2, "$test_type: Prefetched grouped search returns correct number of rows");
         is ($books->page(1)->count, 2, "$test_type: Prefetched grouped search returns correct count");