Skip to content

Add parameter sqlOptionsBuilder. #752

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

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
+31 −7
Open

Add parameter sqlOptionsBuilder. #752

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
9ddcfab
Add parameter sqlOptionsBuilder.
chriscena Sep 19, 2025
c298f50
Added test with NetTopologySuite.
chriscena Nov 14, 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
2 changes: 2 additions & 0 deletions src/Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,12 @@
<PackageVersion Include="MethodTimer.Fody" Version="3.2.3" />
<PackageVersion Include="Microsoft.Data.SqlClient" Version="6.1.3" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer" Version="10.0.0" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" Version="10.0.0" />
<PackageVersion Include="Microsoft.Extensions.DependencyInjection.Abstractions" Version="10.0.0" />
<PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.0.1" />
<PackageVersion Include="Microsoft.Win32.Registry" Version="5.0.0" />
<PackageVersion Include="Microsoft.Sbom.Targets" Version="4.1.3" />
<PackageVersion Include="NetTopologySuite" Version="2.6.0" />
<PackageVersion Include="NUnit" Version="4.4.0" />
<PackageVersion Include="NUnit3TestAdapter" Version="5.2.0" />
<PackageVersion Include="Polyfill" Version="9.0.2" />
Expand Down
2 changes: 2 additions & 0 deletions src/EfLocalDb.Tests/EfLocalDb.Tests.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,8 @@
<None Include="..\TestData\suppliedTemplate_log.ldf" Link="suppliedTemplate_log.ldf">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer.NetTopologySuite" />
<PackageReference Include="NetTopologySuite" />
<PackageReference Include="NUnit" />
<PackageReference Include="NUnit3TestAdapter" />
<PackageReference Include="Verify.NUnit" />
Expand Down
26 changes: 23 additions & 3 deletions src/EfLocalDb.Tests/Tests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
#pragma warning disable CS0612 // Type or member is obsolete
#pragma warning disable CS0612 // Type or member is obsolete
using NetTopologySuite.Geometries;

[TestFixture]
public class Tests
Expand Down Expand Up @@ -29,8 +30,8 @@ static void Add(List<object?> objects, IServiceProvider provider)

await using var database = await instance.Build();
await using var asyncScope = database.CreateAsyncScope();
await using var providerAsyncScope = ((IServiceProvider) database).CreateAsyncScope();
await using var scopeFactoryAsyncScope = ((IServiceScopeFactory) database).CreateAsyncScope();
await using var providerAsyncScope = ((IServiceProvider)database).CreateAsyncScope();
await using var scopeFactoryAsyncScope = ((IServiceScopeFactory)database).CreateAsyncScope();
using var scope = database.CreateScope();
var list = new List<object?>();
Add(list, database);
Expand Down Expand Up @@ -597,4 +598,23 @@ public async Task FiltersEnabled_AfterWithDisabled()
QueryFilter.Enable();
Null(await context.FindAsync<TestEntity>(entity.Id));
}

[Test]
public void EntityWithGeometry()
{
SqlInstance<GeometryDbContext> sqlInstance = new (builder => new(builder.Options),
sqlOptionsBuilder: sb => sb.UseNetTopologySuite());
NotNull(sqlInstance);
}

public class GeometryDbContext(DbContextOptions options) : DbContext(options)
{
public DbSet<GeometryEntity> GeometryEntities { get; set; } = null!;
}

public class GeometryEntity
{
public int Id { get; set; }
public Geometry? Location { get; set; }
}
}
8 changes: 4 additions & 4 deletions src/EfLocalDb/SqlInstance.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace EfLocalDb;
namespace EfLocalDb;

public partial class SqlInstance<TDbContext>
where TDbContext : DbContext
Expand Down Expand Up @@ -88,7 +88,7 @@ public SqlInstance(

storage ??= DefaultStorage;
var resultTimestamp = GetTimestamp(timestamp, buildTemplate);
Model = BuildModel(constructInstance);
Model = BuildModel(constructInstance, sqlOptionsBuilder);
InitEntityMapping();
this.constructInstance = constructInstance;
this.sqlOptionsBuilder = sqlOptionsBuilder;
Expand Down Expand Up @@ -144,10 +144,10 @@ static DateTime GetTimestamp(DateTime? timestamp, Delegate? buildTemplate)
return Timestamp.LastModified(buildTemplate);
}

static IModel BuildModel(ConstructInstance<TDbContext> constructInstance)
static IModel BuildModel(ConstructInstance<TDbContext> constructInstance, Action<SqlServerDbContextOptionsBuilder>? sqlOptionsBuilder)
{
var builder = DefaultOptionsBuilder.Build<TDbContext>();
builder.UseSqlServer("Fake");
builder.UseSqlServer("Fake", sqlOptionsBuilder);
return constructInstance(builder).Model;
}

Expand Down