diff --git a/src/HotChocolate/MongoDb/src/Data/Driver/AndFilterDefinition.cs b/src/HotChocolate/MongoDb/src/Data/Driver/AndFilterDefinition.cs index d7185ff2225..ac817ad40d6 100644 --- a/src/HotChocolate/MongoDb/src/Data/Driver/AndFilterDefinition.cs +++ b/src/HotChocolate/MongoDb/src/Data/Driver/AndFilterDefinition.cs @@ -2,6 +2,7 @@ using System.Linq; using MongoDB.Bson; using MongoDB.Bson.Serialization; +using MongoDB.Driver.Linq; namespace HotChocolate.Data.MongoDb { @@ -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; diff --git a/src/HotChocolate/MongoDb/src/Data/Driver/MongoDbFilterDefinition.cs b/src/HotChocolate/MongoDb/src/Data/Driver/MongoDbFilterDefinition.cs index 11a5e811611..e20ee73fac6 100644 --- a/src/HotChocolate/MongoDb/src/Data/Driver/MongoDbFilterDefinition.cs +++ b/src/HotChocolate/MongoDb/src/Data/Driver/MongoDbFilterDefinition.cs @@ -1,6 +1,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Driver; +using MongoDB.Driver.Linq; namespace HotChocolate.Data.MongoDb { @@ -17,6 +18,14 @@ public override BsonDocument Render( return Render(documentSerializer, serializerRegistry); } + public override BsonDocument Render( + IBsonSerializer documentSerializer, + IBsonSerializerRegistry serializerRegistry, + LinqProvider provider) + { + return Render(documentSerializer, serializerRegistry); + } + public FilterDefinition ToFilterDefinition() => new FilterDefinitionWrapper(this); private class FilterDefinitionWrapper : FilterDefinition @@ -34,6 +43,14 @@ public override BsonDocument Render( { return _filter.Render(documentSerializer, serializerRegistry); } + + public override BsonDocument Render( + IBsonSerializer documentSerializer, + IBsonSerializerRegistry serializerRegistry, + LinqProvider provider) + { + return Render(documentSerializer, serializerRegistry); + } } } } diff --git a/src/HotChocolate/MongoDb/src/Data/Driver/MongoDbProjectionDefinition.cs b/src/HotChocolate/MongoDb/src/Data/Driver/MongoDbProjectionDefinition.cs index 74fca9e291c..a499f2462bf 100644 --- a/src/HotChocolate/MongoDb/src/Data/Driver/MongoDbProjectionDefinition.cs +++ b/src/HotChocolate/MongoDb/src/Data/Driver/MongoDbProjectionDefinition.cs @@ -1,6 +1,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Driver; +using MongoDB.Driver.Linq; namespace HotChocolate.Data.MongoDb { @@ -17,6 +18,14 @@ public override BsonDocument Render( return Render(documentSerializer, serializerRegistry); } + public override BsonDocument Render( + IBsonSerializer documentSerializer, + IBsonSerializerRegistry serializerRegistry, + LinqProvider provider) + { + return Render(documentSerializer, serializerRegistry); + } + public ProjectionDefinition ToProjectionDefinition() => new ProjectionDefinitionWrapper(this); @@ -35,6 +44,14 @@ public override BsonDocument Render( { return _filter.Render(documentSerializer, serializerRegistry); } + + public override BsonDocument Render( + IBsonSerializer documentSerializer, + IBsonSerializerRegistry serializerRegistry, + LinqProvider provider) + { + return Render(documentSerializer, serializerRegistry); + } } } } diff --git a/src/HotChocolate/MongoDb/src/Data/Driver/MongoDbSortDefinition.cs b/src/HotChocolate/MongoDb/src/Data/Driver/MongoDbSortDefinition.cs index 16296a0d1d8..2662f72c6a0 100644 --- a/src/HotChocolate/MongoDb/src/Data/Driver/MongoDbSortDefinition.cs +++ b/src/HotChocolate/MongoDb/src/Data/Driver/MongoDbSortDefinition.cs @@ -1,6 +1,7 @@ using MongoDB.Bson; using MongoDB.Bson.Serialization; using MongoDB.Driver; +using MongoDB.Driver.Linq; namespace HotChocolate.Data.MongoDb { @@ -17,6 +18,14 @@ public override BsonDocument Render( return Render(documentSerializer, serializerRegistry); } + public override BsonDocument Render( + IBsonSerializer documentSerializer, + IBsonSerializerRegistry serializerRegistry, + LinqProvider provider) + { + return Render(documentSerializer, serializerRegistry); + } + public SortDefinition ToSortDefinition() => new SortDefinitionWrapper(this); private class SortDefinitionWrapper : SortDefinition @@ -34,6 +43,14 @@ public override BsonDocument Render( { return _sort.Render(documentSerializer, serializerRegistry); } + + public override BsonDocument Render( + IBsonSerializer documentSerializer, + IBsonSerializerRegistry serializerRegistry, + LinqProvider provider) + { + return Render(documentSerializer, serializerRegistry); + } } } } diff --git a/src/HotChocolate/MongoDb/src/Data/HotChocolate.Data.MongoDb.csproj b/src/HotChocolate/MongoDb/src/Data/HotChocolate.Data.MongoDb.csproj index 1f74f3807bb..07507a2da0d 100644 --- a/src/HotChocolate/MongoDb/src/Data/HotChocolate.Data.MongoDb.csproj +++ b/src/HotChocolate/MongoDb/src/Data/HotChocolate.Data.MongoDb.csproj @@ -9,13 +9,13 @@ - - - + + + - + diff --git a/src/HotChocolate/MongoDb/src/Types/HotChocolate.Types.MongoDb.csproj b/src/HotChocolate/MongoDb/src/Types/HotChocolate.Types.MongoDb.csproj index b8cba9b39e4..c986cf7f43b 100644 --- a/src/HotChocolate/MongoDb/src/Types/HotChocolate.Types.MongoDb.csproj +++ b/src/HotChocolate/MongoDb/src/Types/HotChocolate.Types.MongoDb.csproj @@ -13,7 +13,7 @@ - + diff --git a/src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/HotChocolate.Data.MongoDb.Filters.Tests.csproj b/src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/HotChocolate.Data.MongoDb.Filters.Tests.csproj index f23a2e6af2c..b400be17245 100644 --- a/src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/HotChocolate.Data.MongoDb.Filters.Tests.csproj +++ b/src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/HotChocolate.Data.MongoDb.Filters.Tests.csproj @@ -12,7 +12,6 @@ - - + diff --git a/src/HotChocolate/MongoDb/test/Data.MongoDb.Paging.Tests/HotChocolate.Data.MongoDb.Paging.Tests.csproj b/src/HotChocolate/MongoDb/test/Data.MongoDb.Paging.Tests/HotChocolate.Data.MongoDb.Paging.Tests.csproj index 4090ce27696..57a9ed2be29 100644 --- a/src/HotChocolate/MongoDb/test/Data.MongoDb.Paging.Tests/HotChocolate.Data.MongoDb.Paging.Tests.csproj +++ b/src/HotChocolate/MongoDb/test/Data.MongoDb.Paging.Tests/HotChocolate.Data.MongoDb.Paging.Tests.csproj @@ -12,7 +12,6 @@ - - + diff --git a/src/HotChocolate/MongoDb/test/Data.MongoDb.Projections.Tests/HotChocolate.Data.MongoDb.Projections.Tests.csproj b/src/HotChocolate/MongoDb/test/Data.MongoDb.Projections.Tests/HotChocolate.Data.MongoDb.Projections.Tests.csproj index 7f3a7adc77e..3f9d25e7572 100644 --- a/src/HotChocolate/MongoDb/test/Data.MongoDb.Projections.Tests/HotChocolate.Data.MongoDb.Projections.Tests.csproj +++ b/src/HotChocolate/MongoDb/test/Data.MongoDb.Projections.Tests/HotChocolate.Data.MongoDb.Projections.Tests.csproj @@ -13,7 +13,6 @@ - - + diff --git a/src/HotChocolate/MongoDb/test/Data.MongoDb.Sorting.Tests/HotChocolate.Data.MongoDb.Sorting.Tests.csproj b/src/HotChocolate/MongoDb/test/Data.MongoDb.Sorting.Tests/HotChocolate.Data.MongoDb.Sorting.Tests.csproj index 34bfe1b0c5d..d4c63e12151 100644 --- a/src/HotChocolate/MongoDb/test/Data.MongoDb.Sorting.Tests/HotChocolate.Data.MongoDb.Sorting.Tests.csproj +++ b/src/HotChocolate/MongoDb/test/Data.MongoDb.Sorting.Tests/HotChocolate.Data.MongoDb.Sorting.Tests.csproj @@ -12,7 +12,6 @@ - - + diff --git a/src/HotChocolate/MongoDb/test/Types.MongoDb/HotChocolate.Types.MongoDb.Tests.csproj b/src/HotChocolate/MongoDb/test/Types.MongoDb/HotChocolate.Types.MongoDb.Tests.csproj index bcd6656a516..fafc42cc6bd 100644 --- a/src/HotChocolate/MongoDb/test/Types.MongoDb/HotChocolate.Types.MongoDb.Tests.csproj +++ b/src/HotChocolate/MongoDb/test/Types.MongoDb/HotChocolate.Types.MongoDb.Tests.csproj @@ -12,8 +12,7 @@ - - +