Skip to content
This repository was archived by the owner on Dec 29, 2020. It is now read-only.

Commit 37b9e72

Browse files
TrevorPilleyTrevorPilley
committed
Closes #6
OData Context is incorrect if $select query option specified
1 parent 177f9fc commit 37b9e72

9 files changed

+179
-67
lines changed

‎MicroLite.Extensions.WebApi.OData.Tests/MicroLite.Extensions.WebApi.OData.Tests.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -54,8 +54,8 @@
5454
<Reference Include="Moq, Version=4.7.145.0, Culture=neutral, PublicKeyToken=69f491c39445e920, processorArchitecture=MSIL">
5555
<HintPath>..\packages\Moq.4.7.145\lib\net45\Moq.dll</HintPath>
5656
</Reference>
57-
<Reference Include="Net.Http.WebApi.OData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=d54bd485d668c081, processorArchitecture=MSIL">
58-
<HintPath>..\packages\Net.Http.WebApi.OData.4.0.1\lib\net45\Net.Http.WebApi.OData.dll</HintPath>
57+
<Reference Include="Net.Http.WebApi.OData, Version=4.1.0.0, Culture=neutral, PublicKeyToken=d54bd485d668c081, processorArchitecture=MSIL">
58+
<HintPath>..\packages\Net.Http.WebApi.OData.4.1.0\lib\net45\Net.Http.WebApi.OData.dll</HintPath>
5959
</Reference>
6060
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
6161
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

‎MicroLite.Extensions.WebApi.OData.Tests/MicroLiteODataApiControllerTests.cs

Lines changed: 161 additions & 51 deletions
Large diffs are not rendered by default.

‎MicroLite.Extensions.WebApi.OData.Tests/Properties/AssemblyInfo.cs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,6 @@
3232
// You can specify all the values or you can default the Build and Revision Numbers
3333
// by using the '*' as shown below:
3434
// [assembly: AssemblyVersion("1.0.*")]
35-
[assembly: AssemblyVersion("6.6.0.0")]
36-
[assembly: AssemblyFileVersion("6.6.2.0")]
37-
[assembly: CollectionBehavior(DisableTestParallelization = false)]
35+
[assembly: AssemblyVersion("1.0.0.0")]
36+
[assembly: AssemblyFileVersion("1.0.0.0")]
37+
[assembly: CollectionBehavior(DisableTestParallelization = true)]

‎MicroLite.Extensions.WebApi.OData.Tests/TestHelper.cs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
namespace MicroLite.Extensions.WebApi.Tests.OData
22
{
3+
using System.Web.Http;
34
using Net.Http.WebApi.OData.Model;
45
using TestEntities;
56

@@ -9,11 +10,12 @@ internal static void EnsureEDM()
910
{
1011
if (EntityDataModel.Current == null)
1112
{
12-
var entityDataModelBuilder = new EntityDataModelBuilder();
13-
entityDataModelBuilder.RegisterEntitySet<Customer>("Customers", x => x.Id);
14-
entityDataModelBuilder.RegisterEntitySet<Invoice>("Invoices", x => x.Id);
15-
16-
entityDataModelBuilder.BuildModel();
13+
var httpConfiguration = new HttpConfiguration();
14+
httpConfiguration.UseOData(entityDataModelBuilder =>
15+
{
16+
entityDataModelBuilder.RegisterEntitySet<Customer>("Customers", x => x.Id);
17+
entityDataModelBuilder.RegisterEntitySet<Invoice>("Invoices", x => x.Id);
18+
});
1719
}
1820
}
1921
}

‎MicroLite.Extensions.WebApi.OData.Tests/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.4" targetFramework="net45" />
77
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.4" targetFramework="net45" />
88
<package id="Moq" version="4.7.145" targetFramework="net45" />
9-
<package id="Net.Http.WebApi.OData" version="4.0.1" targetFramework="net45" />
9+
<package id="Net.Http.WebApi.OData" version="4.1.0" targetFramework="net45" />
1010
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
1111
<package id="xunit" version="2.0.0" targetFramework="net45" />
1212
<package id="xunit.abstractions" version="2.0.0" targetFramework="net45" />

‎MicroLite.Extensions.WebApi.OData.nuspec

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
<tags>ASP.NET WebApi OData MicroORM ORM POCO Database</tags>
1616
<dependencies>
1717
<dependency id="MicroLite.Extensions.WebApi" version="[6.6.1,7.0)" />
18-
<dependency id="Net.Http.WebApi.OData" version="[4.0,5.0)" />
18+
<dependency id="Net.Http.WebApi.OData" version="[4.1,5.0)" />
1919
</dependencies>
2020
</metadata>
2121
<files>

‎MicroLite.Extensions.WebApi.OData/MicroLite.Extensions.WebApi.OData.csproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252
<Reference Include="MicroLite.Extensions.WebApi, Version=6.6.0.0, Culture=neutral, PublicKeyToken=08410e6798c4fa37, processorArchitecture=MSIL">
5353
<HintPath>..\packages\MicroLite.Extensions.WebApi.6.6.1\lib\net45\MicroLite.Extensions.WebApi.dll</HintPath>
5454
</Reference>
55-
<Reference Include="Net.Http.WebApi.OData, Version=4.0.0.0, Culture=neutral, PublicKeyToken=d54bd485d668c081, processorArchitecture=MSIL">
56-
<HintPath>..\packages\Net.Http.WebApi.OData.4.0.1\lib\net45\Net.Http.WebApi.OData.dll</HintPath>
55+
<Reference Include="Net.Http.WebApi.OData, Version=4.1.0.0, Culture=neutral, PublicKeyToken=d54bd485d668c081, processorArchitecture=MSIL">
56+
<HintPath>..\packages\Net.Http.WebApi.OData.4.1.0\lib\net45\Net.Http.WebApi.OData.dll</HintPath>
5757
</Reference>
5858
<Reference Include="Newtonsoft.Json, Version=10.0.0.0, Culture=neutral, PublicKeyToken=30ad4fe6b2a6aeed, processorArchitecture=MSIL">
5959
<HintPath>..\packages\Newtonsoft.Json.10.0.3\lib\net45\Newtonsoft.Json.dll</HintPath>

‎MicroLite.Extensions.WebApi.OData/MicroLiteODataApiController{TEntity,TEntityKey}.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -283,7 +283,7 @@ protected virtual async Task<HttpResponseMessage> GetEntityResponseAsync(ODataQu
283283

284284
var paged = await this.Session.PagedAsync<dynamic>(sqlQuery, PagingOptions.SkipTake(skip, top));
285285

286-
Uri context = this.Request.ResolveODataContextUri(queryOptions.EntitySet);
286+
Uri context = this.Request.ResolveODataContextUri(queryOptions.EntitySet, queryOptions.Select);
287287
int? count = queryOptions.Count ? paged.TotalResults : default(int?);
288288
Uri nextLink = paged.MoreResultsAvailable ? queryOptions.NextLink(skip, paged.ResultsPerPage) : null;
289289

‎MicroLite.Extensions.WebApi.OData/packages.config

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
<package id="MicroLite.Extensions.WebApi" version="6.6.1" targetFramework="net45" />
55
<package id="Microsoft.AspNet.WebApi.Client" version="5.2.4" targetFramework="net45" />
66
<package id="Microsoft.AspNet.WebApi.Core" version="5.2.4" targetFramework="net45" />
7-
<package id="Net.Http.WebApi.OData" version="4.0.1" targetFramework="net45" />
7+
<package id="Net.Http.WebApi.OData" version="4.1.0" targetFramework="net45" />
88
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net45" />
99
<package id="StyleCop.Analyzers" version="1.1.0-beta004" targetFramework="net45" developmentDependency="true" />
1010
</packages>

0 commit comments

Comments
 (0)