Skip to content

Feature/more tests #55

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 2 commits into from
Jun 7, 2025
Merged

Feature/more tests #55

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9c114fb
Fix nullable values handlings and add tests
Jun 7, 2025
11c114a
Add more JSON tests
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
4 changes: 2 additions & 2 deletions src/PhenX.EntityFrameworkCore.BulkInsert/Metadata/ColumnMetadata.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ internal sealed class ColumnMetadata(IProperty property, SqlDialectBuilder dial

public bool IsGenerated { get; } = property.ValueGenerated != ValueGenerated.Never;

public object? GetValue(object entity, BulkInsertOptions options)
public object GetValue(object entity, BulkInsertOptions options)
{
var result = _getter(entity);

Expand All @@ -40,7 +40,7 @@ internal sealed class ColumnMetadata(IProperty property, SqlDialectBuilder dial
}
}

return result;
return result ?? DBNull.Value;
}

private static Func<object, object?> BuildGetter(IProperty property)
Expand Down
8 changes: 8 additions & 0 deletions tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/JsonDbObject.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
namespace PhenX.EntityFrameworkCore.BulkInsert.Tests.DbContext;

public class JsonDbObject
{
public int Code { get; set; }

public string Name { get; set; } = string.Empty;
}
15 changes: 10 additions & 5 deletions tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestDbContext.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)

modelBuilder.Entity<TestEntityWithJson>(b =>
{
b.Property(x => x.Json).AsJsonString("jsonb");
b.Property(x => x.JsonArray).AsJsonString("jsonb");
b.Property(x => x.JsonObject).AsJsonString("jsonb");
});

modelBuilder.Entity<TestEntity>(b =>
Expand All @@ -54,7 +55,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)

modelBuilder.Entity<TestEntityWithJson>(b =>
{
b.Property(x => x.Json).AsJsonString("json");
b.Property(x => x.JsonArray).AsJsonString("json");
b.Property(x => x.JsonObject).AsJsonString("json");
});

modelBuilder.Entity<TestEntity>(b =>
Expand All @@ -72,7 +74,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)

modelBuilder.Entity<TestEntityWithJson>(b =>
{
b.Property(x => x.Json).AsJsonString(null);
b.Property(x => x.JsonArray).AsJsonString(null);
b.Property(x => x.JsonObject).AsJsonString(null);
});

modelBuilder.Entity<TestEntity>(b =>
Expand All @@ -90,7 +93,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)

modelBuilder.Entity<TestEntityWithJson>(b =>
{
b.Property(x => x.Json).AsJsonString(null);
b.Property(x => x.JsonArray).AsJsonString(null);
b.Property(x => x.JsonObject).AsJsonString(null);
});

modelBuilder.Entity<TestEntity>(b =>
Expand All @@ -108,7 +112,8 @@ protected override void OnModelCreating(ModelBuilder modelBuilder)

modelBuilder.Entity<TestEntityWithJson>(b =>
{
b.Property(x => x.Json).AsJsonString(null);
b.Property(x => x.JsonArray).AsJsonString(null);
b.Property(x => x.JsonObject).AsJsonString(null);
});

modelBuilder.Entity<TestEntity>(b =>
Expand Down
7 changes: 7 additions & 0 deletions tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestEntity.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,13 @@ public class TestEntity : TestEntityBase
[Column("the_identifier")]
public Guid Identifier { get; set; }

[Column("nullable_identifier")]
public Guid? NullableIdentifier { get; set; }

public DateTime Created { get; set; }

public DateTime? Modified { get; set; }

[Column("string_enum_value")]
public StringEnum StringEnumValue { get; set; }

Expand Down
4 changes: 3 additions & 1 deletion tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestEntityWithJson.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,5 +9,7 @@
[Key]
public int Id { get; set; }

public List<int> Json { get; set; } = [];
public List<int> JsonArray { get; set; } = [];

public JsonDbObject JsonObject { get; set; }

Check warning on line 14 in tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestEntityWithJson.cs

View workflow job for this annotation

GitHub Actions / build (net9.0, 9.0.x) 

Non-nullable property 'JsonObject' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the property as nullable.

Check warning on line 14 in tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestEntityWithJson.cs

View workflow job for this annotation

GitHub Actions / build (net9.0, 9.0.x) 

Non-nullable property 'JsonObject' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the property as nullable.

Check warning on line 14 in tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestEntityWithJson.cs

View workflow job for this annotation

GitHub Actions / build (net8.0, 8.0.x) 

Non-nullable property 'JsonObject' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the property as nullable.

Check warning on line 14 in tests/PhenX.EntityFrameworkCore.BulkInsert.Tests/DbContext/TestEntityWithJson.cs

View workflow job for this annotation

GitHub Actions / build (net8.0, 8.0.x) 

Non-nullable property 'JsonObject' must contain a non-null value when exiting constructor. Consider adding the 'required' modifier or declaring the property as nullable.
}
12 changes: 10 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 @@ -54,8 +54,16 @@ public async Task InsertEntities_WithJson(InsertStrategy strategy)
// Arrange
var entities = new List<TestEntityWithJson>
{
new TestEntityWithJson { Json = [1] },
new TestEntityWithJson { Json = [2] }
new TestEntityWithJson
{
JsonArray = [1],
JsonObject = new JsonDbObject { Code = 1, Name = "Test1" },
},
new TestEntityWithJson
{
JsonArray = [2],
JsonObject = new JsonDbObject { Code = 2, Name = "Test2" },
},
};

// Act
Expand Down