Skip to content

CSHARP-1913: Support using Dictionary fields as IEnumerable<KeyValuePair<TKey, TValue>> #1800

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

Merged
merged 5 commits into from
Oct 28, 2025
Merged

CSHARP-1913: Support using Dictionary fields as IEnumerable<KeyValuePair<TKey, TValue>> #1800

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
eafd5ab
CSHARP-1913: Support top-level SelectMany with Dictionary.
rstam Oct 22, 2025
2cf31c2
CSHARP-1913: Verify that this fixes CSHARP-4251 also.
rstam Oct 22, 2025
27d21ba
CSHARP-1913: Added tests for nested SelectMany.
rstam Oct 23, 2025
60558b7
CSHARP-1913: Requested changes.
rstam Oct 23, 2025
867ab5c
CSHARP-1913: Removed extra blank line.
rstam Oct 23, 2025
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
30 changes: 15 additions & 15 deletions tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp1913Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,8 +37,8 @@ public void Nested__SelectMany_with_ArrayOfArrays_representation_should_work()

var queryable = collection.AsQueryable()
.OfType<C>()
.Where( to => to.Name == "TestName" )
.Select( to => to.DictionaryWithArrayOfArraysRepresentation.SelectMany(kvp => new KeyValuePair<string, string>[] { kvp }) );
.Where(to => to.Name == "TestName")
.Select(to => to.DictionaryWithArrayOfArraysRepresentation.SelectMany(kvp => new KeyValuePair<string, string>[] { kvp }));

var stages = Translate(collection, queryable);
AssertStages(
Expand All @@ -57,8 +57,8 @@ public void Nested__SelectMany_with_ArrayOfDocuments_representation_should_work(

var queryable = collection.AsQueryable()
.OfType<C>()
.Where( to => to.Name == "TestName" )
.Select( to => to.DictionaryWithArrayOfDocumentsRepresentation.SelectMany(kvp => new KeyValuePair<string, string>[] { kvp }) );
.Where(to => to.Name == "TestName")
.Select(to => to.DictionaryWithArrayOfDocumentsRepresentation.SelectMany(kvp => new KeyValuePair<string, string>[] { kvp }));

var stages = Translate(collection, queryable);
AssertStages(
Expand All @@ -77,8 +77,8 @@ public void Nested_SelectMany_with_Document_representation_should_work()

var queryable = collection.AsQueryable()
.OfType<C>()
.Where( to => to.Name == "TestName" )
.Select( to => to.DictionaryWithDocumentRepresentation.SelectMany(kvp => new KeyValuePair<string, string>[] { kvp }) );
.Where(to => to.Name == "TestName")
.Select(to => to.DictionaryWithDocumentRepresentation.SelectMany(kvp => new KeyValuePair<string, string>[] { kvp }));

var stages = Translate(collection, queryable);
AssertStages(
Expand All @@ -97,8 +97,8 @@ public void Top_level_SelectMany_with_ArrayOfArrays_representation_should_work()

var queryable = collection.AsQueryable()
.OfType<C>()
.Where( to => to.Name == "TestName" )
.SelectMany( to => to.DictionaryWithArrayOfArraysRepresentation );
.Where(to => to.Name == "TestName")
.SelectMany(to => to.DictionaryWithArrayOfArraysRepresentation);

var stages = Translate(collection, queryable);
AssertStages(
Expand All @@ -124,8 +124,8 @@ public void Top_level_SelectMany_with_ArrayOfDocuments_representation_should_wor

var queryable = collection.AsQueryable()
.OfType<C>()
.Where( to => to.Name == "TestName" )
.SelectMany( to => to.DictionaryWithArrayOfDocumentsRepresentation );
.Where(to => to.Name == "TestName")
.SelectMany(to => to.DictionaryWithArrayOfDocumentsRepresentation);

var stages = Translate(collection, queryable);
AssertStages(
Expand All @@ -151,8 +151,8 @@ public void Top_level_SelectMany_with_Document_representation_should_work()

var queryable = collection.AsQueryable()
.OfType<C>()
.Where( to => to.Name == "TestName" )
.SelectMany( to => to.DictionaryWithDocumentRepresentation);
.Where(to => to.Name == "TestName")
.SelectMany(to => to.DictionaryWithDocumentRepresentation);

var stages = Translate(collection, queryable);
AssertStages(
Expand All @@ -176,14 +176,14 @@ public class C
public int Id { get; set; }
public string Name {get;set;}

[BsonDictionaryOptions( DictionaryRepresentation.ArrayOfArrays )]
[BsonDictionaryOptions(DictionaryRepresentation.ArrayOfArrays)]
public Dictionary<string,string> DictionaryWithArrayOfArraysRepresentation { get; set; } = new Dictionary<string, string>();


Copy link
Contributor

@adelinowona adelinowona Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

there is a double blank line here, we should remove one

[BsonDictionaryOptions( DictionaryRepresentation.ArrayOfDocuments )]
[BsonDictionaryOptions(DictionaryRepresentation.ArrayOfDocuments)]
public Dictionary<string,string> DictionaryWithArrayOfDocumentsRepresentation { get; set; } = new Dictionary<string, string>();

[BsonDictionaryOptions( DictionaryRepresentation.Document )]
[BsonDictionaryOptions(DictionaryRepresentation.Document)]
public Dictionary<string,string> DictionaryWithDocumentRepresentation { get; set; } = new Dictionary<string, string>();
}

Expand Down
77 changes: 0 additions & 77 deletions tests/MongoDB.Driver.Tests/Linq/Linq3Implementation/Jira/CSharp4251Tests.cs
View file
Open in desktop
Copy link
Contributor

@adelinowona adelinowona Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

As discussed in our meeting, we can remove this test.

Copy link
Contributor Author

@rstam rstam Oct 23, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think this test serves a useful purpose in proving that this PR also fixes 4251 but at your request I will remove it.

This file was deleted.