Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Upgraded Mongo Driver to 2.14 #4508

Merged
merged 4 commits into from
Nov 30, 2021
Merged

Upgraded Mongo Driver to 2.14 #4508

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
81e38eb
Upgraded Mongo Driver to 2.14
PascalSenn Nov 30, 2021
67ab036
Merge branch 'main' into pse/feat-upgrade-mongo-driver
michaelstaib Nov 30, 2021
9850ac8
Merge branch 'main' into pse/feat-upgrade-mongo-driver
michaelstaib Nov 30, 2021
9c7e667
Merge branch 'main' into pse/feat-upgrade-mongo-driver
michaelstaib Nov 30, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion src/HotChocolate/MongoDb/src/Data/Driver/AndFilterDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
using System.Linq;
using MongoDB.Bson;
using MongoDB.Bson.Serialization;
using MongoDB.Driver.Linq;

namespace HotChocolate.Data.MongoDb
{
Expand All @@ -12,7 +13,10 @@ public sealed class AndFilterDefinition : MongoDbFilterDefinition
{
private static readonly string[] __operatorsThatCannotBeCombined = new[]
{
"$geoWithin", "$near", "$geoIntersects", "$nearSphere"
"$geoWithin",
"$near",
"$geoIntersects",
"$nearSphere"
};

private readonly MongoDbFilterDefinition[] _filters;
Expand Down
17 changes: 17 additions & 0 deletions src/HotChocolate/MongoDb/src/Data/Driver/MongoDbFilterDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using MongoDB.Bson;
using MongoDB.Bson.Serialization;
using MongoDB.Driver;
using MongoDB.Driver.Linq;

namespace HotChocolate.Data.MongoDb
{
Expand All @@ -17,6 +18,14 @@ public override BsonDocument Render(
return Render(documentSerializer, serializerRegistry);
}

public override BsonDocument Render(
IBsonSerializer<BsonDocument> documentSerializer,
IBsonSerializerRegistry serializerRegistry,
LinqProvider provider)
{
return Render(documentSerializer, serializerRegistry);
}

public FilterDefinition<T> ToFilterDefinition<T>() => new FilterDefinitionWrapper<T>(this);

private class FilterDefinitionWrapper<T> : FilterDefinition<T>
Expand All @@ -34,6 +43,14 @@ public override BsonDocument Render(
{
return _filter.Render(documentSerializer, serializerRegistry);
}

public override BsonDocument Render(
IBsonSerializer<T> documentSerializer,
IBsonSerializerRegistry serializerRegistry,
LinqProvider provider)
{
return Render(documentSerializer, serializerRegistry);
}
}
}
}
17 changes: 17 additions & 0 deletions src/HotChocolate/MongoDb/src/Data/Driver/MongoDbProjectionDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using MongoDB.Bson;
using MongoDB.Bson.Serialization;
using MongoDB.Driver;
using MongoDB.Driver.Linq;

namespace HotChocolate.Data.MongoDb
{
Expand All @@ -17,6 +18,14 @@ public override BsonDocument Render(
return Render(documentSerializer, serializerRegistry);
}

public override BsonDocument Render(
IBsonSerializer<BsonDocument> documentSerializer,
IBsonSerializerRegistry serializerRegistry,
LinqProvider provider)
{
return Render(documentSerializer, serializerRegistry);
}

public ProjectionDefinition<T> ToProjectionDefinition<T>() =>
new ProjectionDefinitionWrapper<T>(this);

Expand All @@ -35,6 +44,14 @@ public override BsonDocument Render(
{
return _filter.Render(documentSerializer, serializerRegistry);
}

public override BsonDocument Render(
IBsonSerializer<T> documentSerializer,
IBsonSerializerRegistry serializerRegistry,
LinqProvider provider)
{
return Render(documentSerializer, serializerRegistry);
}
}
}
}
17 changes: 17 additions & 0 deletions src/HotChocolate/MongoDb/src/Data/Driver/MongoDbSortDefinition.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
using MongoDB.Bson;
using MongoDB.Bson.Serialization;
using MongoDB.Driver;
using MongoDB.Driver.Linq;

namespace HotChocolate.Data.MongoDb
{
Expand All @@ -17,6 +18,14 @@ public override BsonDocument Render(
return Render(documentSerializer, serializerRegistry);
}

public override BsonDocument Render(
IBsonSerializer<BsonDocument> documentSerializer,
IBsonSerializerRegistry serializerRegistry,
LinqProvider provider)
{
return Render(documentSerializer, serializerRegistry);
}

public SortDefinition<T> ToSortDefinition<T>() => new SortDefinitionWrapper<T>(this);

private class SortDefinitionWrapper<TDocument> : SortDefinition<TDocument>
Expand All @@ -34,6 +43,14 @@ public override BsonDocument Render(
{
return _sort.Render(documentSerializer, serializerRegistry);
}

public override BsonDocument Render(
IBsonSerializer<TDocument> documentSerializer,
IBsonSerializerRegistry serializerRegistry,
LinqProvider provider)
{
return Render(documentSerializer, serializerRegistry);
}
}
}
}
8 changes: 4 additions & 4 deletions src/HotChocolate/MongoDb/src/Data/HotChocolate.Data.MongoDb.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,13 +9,13 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\Core\src\Execution\HotChocolate.Execution.csproj" />
<ProjectReference Include="..\..\..\Core\src\Types.OffsetPagination\HotChocolate.Types.OffsetPagination.csproj" />
<ProjectReference Include="..\..\..\Data\src\Data\HotChocolate.Data.csproj" />
<ProjectReference Include="..\..\..\Core\src\Execution\HotChocolate.Execution.csproj"/>
<ProjectReference Include="..\..\..\Core\src\Types.OffsetPagination\HotChocolate.Types.OffsetPagination.csproj"/>
<ProjectReference Include="..\..\..\Data\src\Data\HotChocolate.Data.csproj"/>
</ItemGroup>

<ItemGroup>
<PackageReference Include="MongoDB.Driver" Version="2.11.2" />
<PackageReference Include="MongoDB.Driver" Version="2.14.0"/>
</ItemGroup>

<ItemGroup>
Expand Down
2 changes: 1 addition & 1 deletion src/HotChocolate/MongoDb/src/Types/HotChocolate.Types.MongoDb.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="MongoDB.Driver" Version="2.11.2" />
<PackageReference Include="MongoDB.Driver" Version="2.14.0"/>
</ItemGroup>

<ItemGroup>
Expand Down
3 changes: 1 addition & 2 deletions ...te/MongoDb/test/Data.MongoDb.Filters.Tests/HotChocolate.Data.MongoDb.Filters.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

<ItemGroup>
<PackageReference Include="Squadron.Mongo" Version="0.5.0" />
<PackageReference Include="MongoDB.Driver.Core" Version="2.11.2" />
<PackageReference Include="MongoDB.Bson" Version="2.11.2" />
<PackageReference Include="MongoDB.Driver" Version="2.14.0"/>
</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions ...late/MongoDb/test/Data.MongoDb.Paging.Tests/HotChocolate.Data.MongoDb.Paging.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

<ItemGroup>
<PackageReference Include="Squadron.Mongo" Version="0.5.0" />
<PackageReference Include="MongoDB.Driver.Core" Version="2.11.2" />
<PackageReference Include="MongoDB.Bson" Version="2.11.2" />
<PackageReference Include="MongoDB.Driver" Version="2.14.0"/>
</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions ...Db/test/Data.MongoDb.Projections.Tests/HotChocolate.Data.MongoDb.Projections.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@

<ItemGroup>
<PackageReference Include="Squadron.Mongo" Version="0.5.0" />
<PackageReference Include="MongoDB.Driver.Core" Version="2.11.2" />
<PackageReference Include="MongoDB.Bson" Version="2.11.2" />
<PackageReference Include="MongoDB.Driver" Version="2.14.0"/>
</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions ...te/MongoDb/test/Data.MongoDb.Sorting.Tests/HotChocolate.Data.MongoDb.Sorting.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

<ItemGroup>
<PackageReference Include="Squadron.Mongo" Version="0.5.0" />
<PackageReference Include="MongoDB.Driver.Core" Version="2.11.2" />
<PackageReference Include="MongoDB.Bson" Version="2.11.2" />
<PackageReference Include="MongoDB.Driver" Version="2.14.0"/>
</ItemGroup>
</Project>
3 changes: 1 addition & 2 deletions src/HotChocolate/MongoDb/test/Types.MongoDb/HotChocolate.Types.MongoDb.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,7 @@

<ItemGroup>
<PackageReference Include="Squadron.Mongo" Version="0.5.0" />
<PackageReference Include="MongoDB.Driver.Core" Version="2.11.2" />
<PackageReference Include="MongoDB.Bson" Version="2.11.2" />
<PackageReference Include="MongoDB.Driver" Version="2.14.0"/>
</ItemGroup>

<ItemGroup>
Expand Down