From: Peter Rabbitson Date: Fri, 4 Dec 2009 10:44:47 +0000 (+0000) Subject: The complex prefetch rewrite actually takes care of this as cleanly as possible X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=7bf9f1b08213e2f6647ac7a6d457906e7b5f41c5;p=dbsrgits%2FDBIx-Class-Historic.git The complex prefetch rewrite actually takes care of this as cleanly as possible --- diff --git a/t/sqlahacks/limit_dialects/rno.t b/t/sqlahacks/limit_dialects/rno.t deleted file mode 100644 index e47e95f..0000000 --- a/t/sqlahacks/limit_dialects/rno.t +++ /dev/null @@ -1,145 +0,0 @@ -use strict; -use warnings; - -use Test::More; -use lib qw(t/lib); -use DBICTest; -use DBIC::SqlMakerTest; - -my $schema = DBICTest->init_schema( - no_deploy => 1, - no_populate => 1, - storage_type => '::DBI::MSSQL', -); - -my $rs = $schema->resultset ('BooksInLibrary')->search ({}, { prefetch => 'owner', rows => 1, offset => 3 }); - -sub default_test_order { - my $order_by = shift; - is_same_sql_bind( - $rs->search ({}, {order_by => $order_by})->as_query, - "(SELECT me__id, me__source, me__owner, me__title, me__price, owner__id, owner__name FROM - ( - SELECT Q1.*, ROW_NUMBER() OVER( ) AS ROW_NUM FROM ( - SELECT me.id, me.source, me.owner, me.title, me.price, owner.id, owner.name - FROM books me JOIN owners owner ON owner.id = me.owner WHERE ( source = ? ) - ) Q1 - ) Q2 - WHERE ROW_NUM BETWEEN 4 and 4 - )", - [ [ source => 'Library' ] ], - ); -} - -sub test_order { - my $args = shift; - - my $req_order = $args->{order_req} - ? "ORDER BY $args->{order_req}" - : '' - ; - - is_same_sql_bind( - $rs->search ({}, {order_by => $args->{order_by}})->as_query, - "(SELECT me__id, me__source, me__owner, me__title, me__price, owner__id, owner__name FROM - ( - SELECT Q1.*, ROW_NUMBER() OVER( ) AS ROW_NUM FROM ( - SELECT me.id, me.source, me.owner, me.title, me.price, owner.id, owner.name - FROM books me JOIN owners owner ON owner.id = me.owner WHERE ( source = ? ) - $req_order - ) Q1 - ) Q2 - WHERE ROW_NUM BETWEEN 4 and 4 - )", - [ [ source => 'Library' ] ], - ); -} - -my @tests = ( - { - order_by => \'foo DESC', - order_req => 'foo DESC', - order_inner => 'foo DESC', - order_outer => 'foo ASC' - }, - { - order_by => { -asc => 'foo' }, - order_req => 'foo ASC', - order_inner => 'foo ASC', - order_outer => 'foo DESC', - }, - { - order_by => 'foo', - order_req => 'foo', - order_inner => 'foo ASC', - order_outer => 'foo DESC', - }, - { - order_by => [ qw{ foo bar} ], - order_req => 'foo, bar', - order_inner => 'foo ASC,bar ASC', - order_outer => 'foo DESC, bar DESC', - }, - { - order_by => { -desc => 'foo' }, - order_req => 'foo DESC', - order_inner => 'foo DESC', - order_outer => 'foo ASC', - }, - { - order_by => ['foo', { -desc => 'bar' } ], - order_req => 'foo, bar DESC', - order_inner => 'foo ASC, bar DESC', - order_outer => 'foo DESC, bar ASC', - }, - { - order_by => { -asc => [qw{ foo bar }] }, - order_req => 'foo ASC, bar ASC', - order_inner => 'foo ASC, bar ASC', - order_outer => 'foo DESC, bar DESC', - }, - { - order_by => [ - { -asc => 'foo' }, - { -desc => [qw{bar}] }, - { -asc => [qw{hello sensors}]}, - ], - order_req => 'foo ASC, bar DESC, hello ASC, sensors ASC', - order_inner => 'foo ASC, bar DESC, hello ASC, sensors ASC', - order_outer => 'foo DESC, bar ASC, hello DESC, sensors DESC', - }, -); - -my @default_tests = ( undef, '', {}, [] ); - -plan (tests => scalar @tests + scalar @default_tests + 1); - -test_order ($_) for @tests; -default_test_order ($_) for @default_tests; - - -is_same_sql_bind ( - $rs->search ({}, { group_by => 'title', order_by => 'title' })->as_query, -'(SELECT -me.id, me.source, me.owner, me.title, me.price, owner.id, owner.name FROM - ( SELECT - id, source, owner, title, price FROM - ( SELECT - TOP 1 id, source, owner, title, price FROM - ( SELECT - TOP 4 me.id, me.source, me.owner, me.title, me.price FROM - books me JOIN - owners owner ON owner.id = me.owner - WHERE ( source = ? ) - GROUP BY title - ORDER BY title ASC - ) me - ORDER BY title DESC - ) me - ORDER BY title - ) me JOIN - owners owner ON owner.id = me.owner WHERE - ( source = ? ) - ORDER BY title)' , - [ [ source => 'Library' ], [ source => 'Library' ] ], -);