Browse Source

DbConnectionOptions to AbpDbConnectionOptions

pull/1919/head
Yunus Emre Kalkan 7 years ago
parent
commit
9bd045d882
  1. 2
      framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs
  2. 4
      framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDbConnectionOptions.cs
  3. 4
      framework/src/Volo.Abp.Data/Volo/Abp/Data/DefaultConnectionStringResolver.cs
  4. 2
      framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs
  5. 2
      framework/test/Volo.Abp.Data.Tests/Volo/Abp/Data/ConnectionStringResolver_Tests.cs
  6. 2
      framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs
  7. 2
      framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/AbpMongoDbTestModule.cs
  8. 2
      framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs
  9. 2
      modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs
  10. 2
      modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbTestModule.cs
  11. 2
      modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs
  12. 2
      modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs
  13. 2
      modules/docs/app/VoloDocs.Migrator/VoloDocsMigratorModule.cs
  14. 2
      modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs
  15. 2
      modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs
  16. 2
      modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs
  17. 2
      modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs
  18. 2
      modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs
  19. 2
      modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs
  20. 2
      modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs
  21. 2
      modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs
  22. 2
      modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/AbpUsersMongoDbTestModule.cs
  23. 2
      samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.MongoDB.Tests/MongoDb/BookStoreMongoDbTestModule.cs
  24. 2
      samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.MongoDB.Tests/MongoDB/BookManagementMongoDbTestModule.cs
  25. 2
      templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs
  26. 2
      templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs

2
framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDataModule.cs

@ -20,7 +20,7 @@ namespace Volo.Abp.Data
{ {
var configuration = context.Services.GetConfiguration(); var configuration = context.Services.GetConfiguration();
Configure<DbConnectionOptions>(configuration); Configure<AbpDbConnectionOptions>(configuration);
context.Services.AddSingleton(typeof(IDataFilter<>), typeof(DataFilter<>)); context.Services.AddSingleton(typeof(IDataFilter<>), typeof(DataFilter<>));
} }

4
framework/src/Volo.Abp.Data/Volo/Abp/Data/DbConnectionOptions.cs → framework/src/Volo.Abp.Data/Volo/Abp/Data/AbpDbConnectionOptions.cs

@ -1,10 +1,10 @@
namespace Volo.Abp.Data namespace Volo.Abp.Data
{ {
public class DbConnectionOptions public class AbpDbConnectionOptions
{ {
public ConnectionStrings ConnectionStrings { get; set; } public ConnectionStrings ConnectionStrings { get; set; }
public DbConnectionOptions() public AbpDbConnectionOptions()
{ {
ConnectionStrings = new ConnectionStrings(); ConnectionStrings = new ConnectionStrings();
} }

4
framework/src/Volo.Abp.Data/Volo/Abp/Data/DefaultConnectionStringResolver.cs

@ -7,9 +7,9 @@ namespace Volo.Abp.Data
{ {
public class DefaultConnectionStringResolver : IConnectionStringResolver, ITransientDependency public class DefaultConnectionStringResolver : IConnectionStringResolver, ITransientDependency
{ {
protected DbConnectionOptions Options { get; } protected AbpDbConnectionOptions Options { get; }
public DefaultConnectionStringResolver(IOptionsSnapshot<DbConnectionOptions> options) public DefaultConnectionStringResolver(IOptionsSnapshot<AbpDbConnectionOptions> options)
{ {
Options = options.Value; Options = options.Value;
} }

2
framework/src/Volo.Abp.MultiTenancy/Volo/Abp/MultiTenancy/MultiTenantConnectionStringResolver.cs

@ -14,7 +14,7 @@ namespace Volo.Abp.MultiTenancy
private readonly IServiceProvider _serviceProvider; private readonly IServiceProvider _serviceProvider;
public MultiTenantConnectionStringResolver( public MultiTenantConnectionStringResolver(
IOptionsSnapshot<DbConnectionOptions> options, IOptionsSnapshot<AbpDbConnectionOptions> options,
ICurrentTenant currentTenant, ICurrentTenant currentTenant,
IServiceProvider serviceProvider) IServiceProvider serviceProvider)
: base(options) : base(options)

2
framework/test/Volo.Abp.Data.Tests/Volo/Abp/Data/ConnectionStringResolver_Tests.cs

@ -42,7 +42,7 @@ namespace Volo.Abp.Data
{ {
public override void ConfigureServices(ServiceConfigurationContext context) public override void ConfigureServices(ServiceConfigurationContext context)
{ {
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = DefaultConnString; options.ConnectionStrings.Default = DefaultConnString;
options.ConnectionStrings[Database1Name] = Database1ConnString; options.ConnectionStrings[Database1Name] = Database1ConnString;

2
framework/test/Volo.Abp.MemoryDb.Tests/Volo/Abp/MemoryDb/AbpMemoryDbTestModule.cs

@ -19,7 +19,7 @@ namespace Volo.Abp.MemoryDb
{ {
var connStr = Guid.NewGuid().ToString(); var connStr = Guid.NewGuid().ToString();
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connStr; options.ConnectionStrings.Default = connStr;
}); });

2
framework/test/Volo.Abp.MongoDB.Tests/Volo/Abp/MongoDB/AbpMongoDbTestModule.cs

@ -23,7 +23,7 @@ namespace Volo.Abp.MongoDB
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

2
framework/test/Volo.Abp.MultiTenancy.Tests/Volo/Abp/Data/MultiTenancy/MultiTenantConnectionStringResolver_Tests.cs

@ -25,7 +25,7 @@ namespace Volo.Abp.Data.MultiTenancy
protected override void BeforeAddApplication(IServiceCollection services) protected override void BeforeAddApplication(IServiceCollection services)
{ {
services.Configure<DbConnectionOptions>(options => services.Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = "default-value"; options.ConnectionStrings.Default = "default-value";
options.ConnectionStrings["db1"] = "db1-default-value"; options.ConnectionStrings["db1"] = "db1-default-value";

2
modules/audit-logging/test/Volo.Abp.AuditLogging.MongoDB.Tests/Volo/Abp/AuditLogging/MongoDB/AbpAuditLoggingMongoDbTestModule.cs

@ -20,7 +20,7 @@ namespace Volo.Abp.AuditLogging.MongoDB
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

2
modules/background-jobs/test/Volo.Abp.BackgroundJobs.MongoDB.Tests/Volo/Abp/BackgroundJobs/MongoDB/BackgroundJobsMongoDbTestModule.cs

@ -20,7 +20,7 @@ namespace Volo.Abp.BackgroundJobs.MongoDB
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

2
modules/blogging/app/Volo.BloggingTestApp/BloggingTestAppModule.cs

@ -66,7 +66,7 @@ namespace Volo.BloggingTestApp
options.RoutePrefix = null; options.RoutePrefix = null;
}); });
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
#if MONGODB #if MONGODB
const string connStringName = "MongoDb"; const string connStringName = "MongoDb";

2
modules/blogging/test/Volo.Blogging.MongoDB.Tests/Volo/Blogging/MongoDB/BloggingMongoDBTestModule.cs

@ -20,7 +20,7 @@ namespace Volo.Blogging.MongoDB
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

2
modules/docs/app/VoloDocs.Migrator/VoloDocsMigratorModule.cs

@ -15,7 +15,7 @@ namespace VoloDocs.Migrator
context.Services.AddAbpDbContext<VoloDocsDbContext>(); context.Services.AddAbpDbContext<VoloDocsDbContext>();
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = configuration["ConnectionString"]; options.ConnectionStrings.Default = configuration["ConnectionString"];
}); });

2
modules/docs/app/VoloDocs.Web/VoloDocsWebModule.cs

@ -68,7 +68,7 @@ namespace VoloDocs.Web
options.RoutePrefix = null; options.RoutePrefix = null;
}); });
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = configuration["ConnectionString"]; options.ConnectionStrings.Default = configuration["ConnectionString"];
}); });

2
modules/docs/test/Volo.Docs.MongoDB.Tests/Volo/Docs/MongoDB/DocsMongoDBTestModule.cs

@ -20,7 +20,7 @@ namespace Volo.Docs.MongoDB
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

2
modules/feature-management/test/Volo.Abp.FeatureManagement.MongoDB.Tests/Volo/Abp/FeatureManagement/MongoDB/AbpFeatureManagementMongoDbTestModule.cs

@ -19,7 +19,7 @@ namespace Volo.Abp.FeatureManagement.MongoDB
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

2
modules/identity/test/Volo.Abp.Identity.MongoDB.Tests/Volo/Abp/Identity/MongoDB/AbpIdentityMongoDbTestModule.cs

@ -22,7 +22,7 @@ namespace Volo.Abp.Identity.MongoDB
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

2
modules/identityserver/test/Volo.Abp.IdentityServer.MongoDB.Tests/Volo/Abp/IdentityServer/AbpIdentityServerMongoDbTestModule.cs

@ -23,7 +23,7 @@ namespace Volo.Abp.IdentityServer
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

2
modules/permission-management/test/Volo.Abp.PermissionManagement.MongoDB.Tests/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbTestModule.cs

@ -18,7 +18,7 @@ namespace Volo.Abp.PermissionManagement.MongoDB
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

2
modules/setting-management/test/Volo.Abp.SettingManagement.MongoDB.Tests/Volo/Abp/SettingManagement/MongoDB/AbpSettingManagementMongoDbTestModule.cs

@ -19,7 +19,7 @@ namespace Volo.Abp.SettingManagement.MongoDB
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

2
modules/tenant-management/test/Volo.Abp.TenantManagement.MongoDB.Tests/Volo/Abp/TenantManagement/MongoDb/AbpTenantManagementMongoDbTestModule.cs

@ -20,7 +20,7 @@ namespace Volo.Abp.TenantManagement.MongoDB
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

2
modules/users/test/Volo.Abp.Users.MongoDB.Tests/Volo/Abp/Users/MongoDB/AbpUsersMongoDbTestModule.cs

@ -20,7 +20,7 @@ namespace Volo.Abp.Users.MongoDB
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

2
samples/BookStore-Angular-MongoDb/aspnet-core/test/Acme.BookStore.MongoDB.Tests/MongoDb/BookStoreMongoDbTestModule.cs

@ -19,7 +19,7 @@ namespace Acme.BookStore.MongoDB
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

2
samples/BookStore-Modular/modules/book-management/test/Acme.BookStore.BookManagement.MongoDB.Tests/MongoDB/BookManagementMongoDbTestModule.cs

@ -20,7 +20,7 @@ namespace Acme.BookStore.BookManagement.MongoDB
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

2
templates/app/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDb/MyProjectNameMongoDbTestModule.cs

@ -19,7 +19,7 @@ namespace MyCompanyName.MyProjectName.MongoDB
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

2
templates/module/aspnet-core/test/MyCompanyName.MyProjectName.MongoDB.Tests/MongoDB/MyProjectNameMongoDbTestModule.cs

@ -20,7 +20,7 @@ namespace MyCompanyName.MyProjectName.MongoDB
"Db_" + "Db_" +
Guid.NewGuid().ToString("N"); Guid.NewGuid().ToString("N");
Configure<DbConnectionOptions>(options => Configure<AbpDbConnectionOptions>(options =>
{ {
options.ConnectionStrings.Default = connectionString; options.ConnectionStrings.Default = connectionString;
}); });

Loading…
Cancel
Save