Skip to content

Don't throw on null value for Uri #57

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
PhenX merged 3 commits into from
Jun 7, 2025
Merged

Don't throw on null value for Uri #57

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0318067
Add null URI to existing converter test
christiaanderidder Jun 7, 2025
cca7af7
Don't invoke the type converter when the incoming complex type value …
christiaanderidder Jun 7, 2025
df333aa
Undo formatting change
christiaanderidder Jun 7, 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
13 changes: 12 additions & 1 deletion src/PhenX.EntityFrameworkCore.BulkInsert/Metadata/PropertyAccessor.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,18 @@ internal static class PropertyAccessor
converterInput = Expression.Convert(getterExpression, converterParamType);
}

getterExpression = Expression.Invoke(converter, converterInput);
var invokeConverter = Expression.Invoke(converter, converterInput);

if (propertyType.IsClass)
{
var nullCondition = Expression.Equal(getterExpression, Expression.Constant(null, propertyType));
var nullResult = Expression.Constant(null, converter.ReturnType);
getterExpression = Expression.Condition(nullCondition, nullResult, invokeConverter);
}
else
{
getterExpression = invokeConverter;
}

propertyType = getterExpression.Type;
}
Expand Down
3 changes: 3 additions & 0 deletions tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestEntityWithConverters.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,5 +14,8 @@ public class TestEntityWithConverters : TestEntityBase

[Column("created_at")]
public DateTime CreatedAt { get; set; }

[Column("uri")]
public Uri? Uri { get; set; }
}

4 changes: 2 additions & 2 deletions tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/Tests/Basic/BasicTestsBase.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,8 +176,8 @@ public async Task InsertEntities_AndReturn_WithEntityWithValueConverters(InsertS

var entities = new List<TestEntityWithConverters>
{
new TestEntityWithConverters() { Name = $"{_run}_Entity1", CreatedAt = now },
new TestEntityWithConverters() { Name = $"{_run}_Entity2", CreatedAt = now.AddDays(-1) }
new TestEntityWithConverters() { Name = $"{_run}_Entity1", CreatedAt = now, Uri = null },
new TestEntityWithConverters() { Name = $"{_run}_Entity2", CreatedAt = now.AddDays(-1), Uri = new Uri("http://example.com/test") }
};

// Act
Expand Down
Loading