X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=blobdiff_plain;f=t%2Fsqlmaker%2Flimit_dialects%2Frno.t;h=32f67c560c3ff11e564d237bed6997afc6ce7843;hb=95252a8cb02e0d6fb5914d02a782bd3e1b20c882;hp=457cf7dfdc13c0a893fb7c93393d9153ea142e5e;hpb=f74d22e2933e0ffed5955df8f35b47a4b096d6ef;p=dbsrgits%2FDBIx-Class-Historic.git diff --git a/t/sqlmaker/limit_dialects/rno.t b/t/sqlmaker/limit_dialects/rno.t index 457cf7d..32f67c5 100644 --- a/t/sqlmaker/limit_dialects/rno.t +++ b/t/sqlmaker/limit_dialects/rno.t @@ -26,10 +26,10 @@ my $rs_selectas_col = $schema->resultset ('BooksInLibrary')->search ({}, { is_same_sql_bind( $rs_selectas_col->as_query, '( - SELECT id, source, owner, title, price, + SELECT me.id, me.source, me.owner, me.title, me.price, owner__name FROM ( - SELECT id, source, owner, title, price, + SELECT me.id, me.source, me.owner, me.title, me.price, owner__name, ROW_NUMBER() OVER( ) AS rno__row__index FROM ( @@ -62,10 +62,10 @@ my $rs_selectas_rel = $schema->resultset ('BooksInLibrary')->search ({}, { is_same_sql_bind( $rs_selectas_rel->as_query, '( - SELECT [id], [source], [owner], [title], [price], + SELECT [me].[id], [me].[source], [me].[owner], [me].[title], [me].[price], [owner_name] FROM ( - SELECT [id], [source], [owner], [title], [price], + SELECT [me].[id], [me].[source], [me].[owner], [me].[title], [me].[price], [owner_name], ROW_NUMBER() OVER( ) AS [rno__row__index] FROM ( @@ -98,6 +98,7 @@ my $rs_selectas_rel = $schema->resultset('BooksInLibrary')->search ({}, { ], join => 'owner', rows => 1, + order_by => 'me.id', }); is_same_sql_bind( @@ -105,13 +106,14 @@ is_same_sql_bind( '( SELECT [owner_name], [owner_books] FROM ( - SELECT [owner_name], [owner_books], ROW_NUMBER() OVER( ) AS [rno__row__index] + SELECT [owner_name], [owner_books], ROW_NUMBER() OVER( ORDER BY [ORDER__BY__001] ) 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] - FROM [books] [me] - JOIN [owners] [owner] ON [owner].[id] = [me].[owner] + WHERE [count].[id] = [owner].[id] and [count].[name] = ? ) AS [owner_books], + [me].[id] AS [ORDER__BY__001] + FROM [books] [me] + JOIN [owners] [owner] ON [owner].[id] = [me].[owner] WHERE ( [source] = ? ) ) [me] ) [me] @@ -190,8 +192,8 @@ my $rs_selectas_rel = $schema->resultset('BooksInLibrary')->search( { -exists => is_same_sql_bind( $rs_selectas_rel->as_query, '( - SELECT [id], [owner] FROM ( - SELECT [id], [owner], ROW_NUMBER() OVER( ) AS [rno__row__index] FROM ( + SELECT [me].[id], [me].[owner] FROM ( + SELECT [me].[id], [me].[owner], ROW_NUMBER() OVER( ) AS [rno__row__index] FROM ( SELECT [me].[id], [me].[owner] FROM [books] [me] WHERE ( ( (EXISTS (