Skip to content

Commit dd989b4

Browse files
glen-84michaelstaib
authored andcommitted
Updated MongoDB Driver to 3.0.0 (#7684)
1 parent 57dbe97 commit dd989b4

File tree

79 files changed

+200
-184
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

79 files changed

+200
-184
lines changed

src/Directory.Packages.props

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="17.11.0" />
3636
<PackageVersion Include="Microsoft.OpenApi" Version="1.6.14" />
3737
<PackageVersion Include="Microsoft.OpenApi.Readers" Version="1.6.14" />
38-
<PackageVersion Include="MongoDB.Driver" Version="2.29.0" />
38+
<PackageVersion Include="MongoDB.Driver" Version="3.0.0" />
3939
<PackageVersion Include="Moq" Version="4.20.70" />
4040
<PackageVersion Include="NetTopologySuite" Version="2.0.0" />
4141
<PackageVersion Include="Newtonsoft.Json" Version="13.0.2" />
@@ -50,7 +50,7 @@
5050
<PackageVersion Include="sqlite-net-pcl" Version="1.9.172" />
5151
<PackageVersion Include="SQLitePCLRaw.bundle_green" Version="2.1.8" />
5252
<PackageVersion Include="SQLitePCLRaw.core" Version="2.1.8" />
53-
<PackageVersion Include="Squadron.Mongo" Version="0.21.0" />
53+
<PackageVersion Include="Squadron.Mongo" Version="0.23.0" />
5454
<PackageVersion Include="Squadron.Nats" Version="0.18.0" />
5555
<PackageVersion Include="Squadron.PostgreSql" Version="0.18.0" />
5656
<PackageVersion Include="Squadron.RabbitMQ" Version="0.18.0" />

src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/MongoDbAggregateFluentTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ await Snapshot
103103
public class Foo
104104
{
105105
[BsonId]
106+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
106107
public Guid Id { get; set; } = Guid.NewGuid();
107108

108109
[BsonElement("renameTest")]
@@ -112,6 +113,7 @@ public class Foo
112113
public class Bar
113114
{
114115
[BsonId]
116+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
115117
public Guid Id { get; set; } = Guid.NewGuid();
116118

117119
public DateTimeOffset Baz { get; set; }

src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/MongoDbCollectionTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,7 @@ await SnapshotExtensions.AddResult(
103103
public class Foo
104104
{
105105
[BsonId]
106+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
106107
public Guid Id { get; set; } = Guid.NewGuid();
107108

108109
[BsonElement("renameTest")]
@@ -112,6 +113,7 @@ public class Foo
112113
public class Bar
113114
{
114115
[BsonId]
116+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
115117
public Guid Id { get; set; } = Guid.NewGuid();
116118

117119
public DateTimeOffset Baz { get; set; }

src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/MongoDbFilterCombinatorTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using CookieCrumble;
22
using HotChocolate.Data.Filters;
33
using HotChocolate.Execution;
4+
using MongoDB.Bson;
45
using MongoDB.Bson.Serialization.Attributes;
56
using Squadron;
67

@@ -42,6 +43,7 @@ await Snapshot.Create()
4243
public class Foo
4344
{
4445
[BsonId]
46+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
4547
public Guid Id { get; set; } = Guid.NewGuid();
4648

4749
public bool Bar { get; set; }

src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/MongoDbFilterVisitorBooleanTests.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using CookieCrumble;
22
using HotChocolate.Data.Filters;
33
using HotChocolate.Execution;
4+
using MongoDB.Bson;
45
using MongoDB.Bson.Serialization.Attributes;
56
using Squadron;
67

@@ -147,6 +148,7 @@ await SnapshotExtensions.AddResult(
147148
public class Foo
148149
{
149150
[BsonId]
151+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
150152
public Guid Id { get; set; } = Guid.NewGuid();
151153

152154
public bool Bar { get; set; }
@@ -155,6 +157,7 @@ public class Foo
155157
public class FooNullable
156158
{
157159
[BsonId]
160+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
158161
public Guid Id { get; set; } = Guid.NewGuid();
159162

160163
public bool? Bar { get; set; }

src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/MongoDbFilterVisitorComparableTests.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
using HotChocolate.Data.Filters;
33
using HotChocolate.Execution;
44
using HotChocolate.Types;
5+
using MongoDB.Bson;
56
using MongoDB.Bson.Serialization.Attributes;
67
using Squadron;
78

@@ -1011,6 +1012,7 @@ public void Create_Implicit_Operation_Normalized()
10111012
public class Foo
10121013
{
10131014
[BsonId]
1015+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
10141016
public Guid Id { get; set; } = Guid.NewGuid();
10151017

10161018
public short BarShort { get; set; }
@@ -1031,6 +1033,7 @@ public class Foo
10311033
public class FooNullable
10321034
{
10331035
[BsonId]
1036+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
10341037
public Guid Id { get; set; } = Guid.NewGuid();
10351038

10361039
public short? BarShort { get; set; }

src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/MongoDbFilterVisitorDateOnlyTests.cs

Lines changed: 2 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -29,9 +29,6 @@ public class MongoDbFilterVisitorDateOnlyTests
2929
public MongoDbFilterVisitorDateOnlyTests(MongoResource resource)
3030
{
3131
Init(resource);
32-
33-
// NOTE: At the time of coding, MongoDB C# Driver doesn't natively support DateOnly
34-
BsonSerializer.RegisterSerializationProvider(new LocalDateOnlySerializationProvider());
3532
}
3633

3734
[Fact]
@@ -153,6 +150,7 @@ await SnapshotExtensions.AddResult(
153150
public class Foo
154151
{
155152
[BsonId]
153+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
156154
public Guid Id { get; set; } = Guid.NewGuid();
157155

158156
public DateOnly Bar { get; set; }
@@ -161,6 +159,7 @@ public class Foo
161159
public class FooNullable
162160
{
163161
[BsonId]
162+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
164163
public Guid Id { get; set; } = Guid.NewGuid();
165164

166165
public DateOnly? Bar { get; set; }
@@ -173,36 +172,4 @@ public class FooFilterType : FilterInputType<Foo>
173172
public class FooNullableFilterType : FilterInputType<FooNullable>
174173
{
175174
}
176-
177-
internal class LocalDateOnlySerializationProvider : IBsonSerializationProvider
178-
{
179-
public IBsonSerializer? GetSerializer(Type type)
180-
{
181-
return type == typeof(DateOnly) ? new DateOnlySerializer() : null;
182-
}
183-
}
184-
185-
internal class DateOnlySerializer : StructSerializerBase<DateOnly>
186-
{
187-
private static readonly TimeOnly _zeroTimeComponent = new();
188-
189-
public override void Serialize(
190-
BsonSerializationContext context,
191-
BsonSerializationArgs args,
192-
DateOnly value)
193-
{
194-
var dateTime = value.ToDateTime(_zeroTimeComponent, DateTimeKind.Utc);
195-
var ticks = BsonUtils.ToMillisecondsSinceEpoch(dateTime);
196-
context.Writer.WriteDateTime(ticks);
197-
}
198-
199-
public override DateOnly Deserialize(
200-
BsonDeserializationContext context,
201-
BsonDeserializationArgs args)
202-
{
203-
var ticks = context.Reader.ReadDateTime();
204-
var dateTime = BsonUtils.ToDateTimeFromMillisecondsSinceEpoch(ticks);
205-
return new DateOnly(dateTime.Year, dateTime.Month, dateTime.Day);
206-
}
207-
}
208175
}

src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/MongoDbFilterVisitorEnumTests.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using CookieCrumble;
22
using HotChocolate.Data.Filters;
33
using HotChocolate.Execution;
4+
using MongoDB.Bson;
45
using MongoDB.Bson.Serialization.Attributes;
56
using Squadron;
67

@@ -283,6 +284,7 @@ await SnapshotExtensions.AddResult(
283284
public class Foo
284285
{
285286
[BsonId]
287+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
286288
public Guid Id { get; set; } = Guid.NewGuid();
287289

288290
public FooEnum BarEnum { get; set; }
@@ -291,6 +293,7 @@ public class Foo
291293
public class FooNullable
292294
{
293295
[BsonId]
296+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
294297
public Guid Id { get; set; } = Guid.NewGuid();
295298

296299
public FooEnum? BarEnum { get; set; }

src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/MongoDbFilterVisitorListTests.cs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
using CookieCrumble;
22
using HotChocolate.Data.Filters;
33
using HotChocolate.Execution;
4+
using MongoDB.Bson;
45
using MongoDB.Bson.Serialization.Attributes;
56
using Squadron;
67

@@ -411,6 +412,7 @@ await SnapshotExtensions.AddResult(
411412
public class Foo
412413
{
413414
[BsonId]
415+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
414416
public Guid Id { get; set; } = Guid.NewGuid();
415417

416418
public IEnumerable<FooNested?>? FooNested { get; set; }
@@ -419,6 +421,7 @@ public class Foo
419421
public class FooSimple
420422
{
421423
[BsonId]
424+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
422425
public Guid Id { get; set; } = Guid.NewGuid();
423426

424427
public IEnumerable<string?>? Bar { get; set; }
@@ -427,6 +430,7 @@ public class FooSimple
427430
public class FooNested
428431
{
429432
[BsonId]
433+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
430434
public Guid Id { get; set; } = Guid.NewGuid();
431435

432436
public string? Bar { get; set; }

src/HotChocolate/MongoDb/test/Data.MongoDb.Filters.Tests/MongoDbFilterVisitorObjectIdTests.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1002,6 +1002,7 @@ await SnapshotExtensions.AddResult(
10021002
public class Foo
10031003
{
10041004
[BsonId]
1005+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
10051006
public Guid Id { get; set; } = Guid.NewGuid();
10061007

10071008
public ObjectId ObjectId { get; set; }
@@ -1010,6 +1011,7 @@ public class Foo
10101011
public class FooNullable
10111012
{
10121013
[BsonId]
1014+
[BsonGuidRepresentation(GuidRepresentation.Standard)]
10131015
public Guid Id { get; set; } = Guid.NewGuid();
10141016

10151017
public ObjectId? ObjectId { get; set; }

0 commit comments

Comments
 (0)