Skip and Take being incorrectly added to a sub-select query

I have a paged query (via a Skip and a Take) that is generating incorrect SQL.

First I am doing a query.Count() to get the total results which is generating correct SQL:

exec sp_executesql N'SELECT
  COUNT(*)
FROM
  [Object]
LEFT OUTER JOIN
  [Event]
ON
  [Object].[Id] = [Event].[Id]
WHERE
  (EXISTS (
    SELECT
      [Place].*
    FROM
      [Place]
    WHERE
      [Place].[Id] = [Event].[PlaceId] AND
      [Place].[CityId] IN (@p0)
  ) AND [Object].[ObjectTypeId] = @p1)',N'@p0 uniqueidentifier,@p1 nvarchar(36)',@p0='BF9C76EE-AC26-4997-883B-C88F4564D7BC',@p1=N'60B2ACC6-6E0C-43E3-8301-8459AF5BDCC8'

Then I am adding a Skip and a Take to the query to get the current pages results:

exec sp_executesql N'SELECT
  [Object].*
FROM
  (
    SELECT
      -- many columns trimmed
      ROW_NUMBER() OVER(ORDER BY [Event].[StartDate] DESC) as RowNumber
    FROM
      [Object]
    LEFT OUTER JOIN
      [Event] [Event]
    ON
      [Object].[Id] = [Event].[Id] -- many left out joins trimmed
    WHERE
      (EXISTS (
        SELECT
          [Place].*
        FROM
          (
            SELECT
              [Place].*,
              ROW_NUMBER() OVER(ORDER BY [Event].[StartDate] DESC) as RowNumber
            FROM
              [Place]
            WHERE
              [Place].[CityId] IN (@p2)
          )
          [Place]
        WHERE
          [Place].[Id] = [Event].[PlaceId] AND
          RowNumber > @p0 AND
          RowNumber <= @p1
      ) AND [Object].[ObjectTypeId] = @p3)
  )
  [Object]
WHERE
  RowNumber > @p0 AND
  RowNumber <= @p1',N'@p0 int,@p1 int,@p2 uniqueidentifier,@p3 nvarchar(36)',@p0=0,@p1=20,@p2='BF9C76EE-AC26-4997-883B-C88F4564D7BC',@p3=N'60B2ACC6-6E0C-43E3-8301-8459AF5BDCC8'

The Place sub-select in this query now has the row number and is filtering on it.

We are not having any luck repro'ing this unfortunately, is it possible to send through a small repro for this? If not, is it possible to capture the expression tree for the query and also send through the appropriate parts of the model which would be involved in the query?

Thanks!

Jeremy

Model + more details sent to you.

Thanks! Thats enough detail to repro the issue - will get back to you on a fix.

Jeremy

Ive added in a fix which should cover this - it will be in tonights nightly build.

Jeremy

Brilliant. I'll try it out in the next nightly build and let you know how I get on.

Fixed. Good work!