Skip to content
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

fix: Fix ConnectionStrings options mode support #546

Merged
merged 1 commit into from
Apr 10, 2023
Merged

fix: Fix ConnectionStrings options mode support #546

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
3 changes: 1 addition & 2 deletions ...e/Masa.Contrib.Data.EFCore/Internal/Isolation/DefaultIsolationConnectionStringProvider.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,8 +43,7 @@ public string GetConnectionString(string name = ConnectionStrings.DEFAULT_CONNEC
return connectionString;

var connectionStrings =
_isolationConfigProvider.GetComponentConfig<ConnectionStrings>(ConnectionStrings.DEFAULT_SECTION,
ConnectionStrings.DEFAULT_SECTION);
_isolationConfigProvider.GetComponentConfig<ConnectionStrings>(ConnectionStrings.DEFAULT_SECTION, string.Empty);
if (connectionStrings != null)
return SetConnectionString(name, connectionStrings.GetConnectionString(name));

Expand Down
43 changes: 39 additions & 4 deletions ...ontrib.Data.EFCore.Tests.Scenes.Isolation/DefaultIsolationConnectionStringProviderTest.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,10 +24,7 @@ public void Initialize()
public async Task TestGetConnectionStringAsync()
{
_services.AddMasaDbContext<CustomDbContext>(dbContextBuilder => dbContextBuilder.UseSqlite());
_services.AddIsolation(isolationBuilder =>
{
isolationBuilder.UseMultiEnvironment();
});
_services.AddIsolation(isolationBuilder => { isolationBuilder.UseMultiEnvironment(); });

var rootServiceProvider = _services.BuildServiceProvider();
using var scope = rootServiceProvider.CreateScope();
Expand Down Expand Up @@ -57,4 +54,42 @@ Task<string> GetConnectionString(IServiceProvider serviceProvider, string name =
return isolationConnectionStringProvider.GetConnectionStringAsync(name);
}
}

[TestMethod]
public async Task TestGetConnectionStringAsyncByAddIsolationConfiguration()
{
_services.AddMasaDbContext<CustomDbContext>(dbContextBuilder => dbContextBuilder.UseSqlite());
_services.AddIsolation(isolationBuilder => { isolationBuilder.UseMultiEnvironment(); });
_services.Configure<IsolationOptions<ConnectionStrings>>(options =>
{
options.Data.Add(new IsolationConfigurationOptions<ConnectionStrings>()
{
Environment = "dev",
Data = new ConnectionStrings(new List<KeyValuePair<string, string>>()
{
new(ConnectionStrings.DEFAULT_CONNECTION_STRING_NAME, "data source=test-manual"),
})
});
});
var rootServiceProvider = _services.BuildServiceProvider();
using var scope = rootServiceProvider.CreateScope();
var connectionString = await GetConnectionString(scope.ServiceProvider);
Assert.AreEqual("data source=test", connectionString);

using var scope2 = rootServiceProvider.CreateScope();
var multiEnvironmentSetter = scope2.ServiceProvider.GetService<IMultiEnvironmentSetter>();
Assert.IsNotNull(multiEnvironmentSetter);
multiEnvironmentSetter.SetEnvironment("dev");
var connectionString2 = await GetConnectionString(scope2.ServiceProvider);
Assert.AreEqual("data source=test-manual", connectionString2);

Task<string> GetConnectionString(IServiceProvider serviceProvider, string name = ConnectionStrings.DEFAULT_CONNECTION_STRING_NAME)
{
var isolationConnectionStringProvider = new DefaultIsolationConnectionStringProvider(
serviceProvider.GetRequiredService<IConnectionStringProviderWrapper>(),
serviceProvider.GetRequiredService<IIsolationConfigProvider>()
);
return isolationConnectionStringProvider.GetConnectionStringAsync(name);
}
}
}