Upgraded Mongo Driver to 2.14 (ChilliCream#4508)

NextWareGroup · Nov 30, 2021 · 0e887e4 · 0e887e4
1 parent edbaf22
commit 0e887e4
Show file tree

Hide file tree

Showing 11 changed files with 66 additions and 16 deletions.
diff --git 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
@@ -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<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>
@@ -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);
+            }
         }
     }
 }
diff --git 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<BsonDocument> documentSerializer,
+            IBsonSerializerRegistry serializerRegistry,
+            LinqProvider provider)
+        {
+            return Render(documentSerializer, serializerRegistry);
+        }
+
         public ProjectionDefinition<T> ToProjectionDefinition<T>() =>
             new ProjectionDefinitionWrapper<T>(this);
 
@@ -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);
+            }
         }
     }
 }
diff --git 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<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>
@@ -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);
+            }
         }
     }
 }
diff --git a/src/HotChocolate/MongoDb/src/Data/HotChocolate.Data.MongoDb.csproj b/src/HotChocolate/MongoDb/src/Data/HotChocolate.Data.MongoDb.csproj
@@ -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>

diff --git a/src/HotChocolate/MongoDb/src/Types/HotChocolate.Types.MongoDb.csproj b/src/HotChocolate/MongoDb/src/Types/HotChocolate.Types.MongoDb.csproj
@@ -13,7 +13,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="MongoDB.Driver" Version="2.11.2" />
+    <PackageReference Include="MongoDB.Driver" Version="2.14.0"/>
   </ItemGroup>
 
   <ItemGroup>

diff --git a/...te/MongoDb/test/Data.MongoDb.Filters.Tests/HotChocolate.Data.MongoDb.Filters.Tests.csproj b/...te/MongoDb/test/Data.MongoDb.Filters.Tests/HotChocolate.Data.MongoDb.Filters.Tests.csproj
@@ -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>
diff --git a/...late/MongoDb/test/Data.MongoDb.Paging.Tests/HotChocolate.Data.MongoDb.Paging.Tests.csproj b/...late/MongoDb/test/Data.MongoDb.Paging.Tests/HotChocolate.Data.MongoDb.Paging.Tests.csproj
@@ -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>
diff --git a/...Db/test/Data.MongoDb.Projections.Tests/HotChocolate.Data.MongoDb.Projections.Tests.csproj b/...Db/test/Data.MongoDb.Projections.Tests/HotChocolate.Data.MongoDb.Projections.Tests.csproj
@@ -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>
diff --git a/...te/MongoDb/test/Data.MongoDb.Sorting.Tests/HotChocolate.Data.MongoDb.Sorting.Tests.csproj b/...te/MongoDb/test/Data.MongoDb.Sorting.Tests/HotChocolate.Data.MongoDb.Sorting.Tests.csproj
@@ -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>
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
@@ -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>