diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs deleted file mode 100644 index 3d3d8236e7..0000000000 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs +++ /dev/null @@ -1,9 +0,0 @@ -namespace MyCompanyName.MyProjectName -{ - public static class MyProjectNameConsts - { - public const string DefaultDbTablePrefix = "MyProjectName"; - - public const string DefaultDbSchema = null; - } -} diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDbProperties.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDbProperties.cs new file mode 100644 index 0000000000..835045f486 --- /dev/null +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameDbProperties.cs @@ -0,0 +1,11 @@ +namespace MyCompanyName.MyProjectName +{ + public static class MyProjectNameDbProperties + { + public static string DbTablePrefix { get; } = "MyProjectName"; + + public static string DbSchema { get; } = null; + + public const string ConnectionStringName = "MyProjectName"; + } +} diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/IMyProjectNameDbContext.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/IMyProjectNameDbContext.cs index cb565702f7..f4be3e0eac 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/IMyProjectNameDbContext.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/IMyProjectNameDbContext.cs @@ -3,7 +3,7 @@ using Volo.Abp.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.EntityFrameworkCore { - [ConnectionStringName("MyProjectName")] + [ConnectionStringName(MyProjectNameDbProperties.ConnectionStringName)] public interface IMyProjectNameDbContext : IEfCoreDbContext { /* Add DbSet for each Aggregate Root here. Example: diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs index 0ea5fb3d3f..1d37924126 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContext.cs @@ -4,13 +4,9 @@ using Volo.Abp.EntityFrameworkCore; namespace MyCompanyName.MyProjectName.EntityFrameworkCore { - [ConnectionStringName("MyProjectName")] + [ConnectionStringName(MyProjectNameDbProperties.ConnectionStringName)] public class MyProjectNameDbContext : AbpDbContext, IMyProjectNameDbContext { - public static string TablePrefix { get; set; } = MyProjectNameConsts.DefaultDbTablePrefix; - - public static string Schema { get; set; } = MyProjectNameConsts.DefaultDbSchema; - /* Add DbSet for each Aggregate Root here. Example: * public DbSet Questions { get; set; } */ @@ -25,11 +21,7 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore { base.OnModelCreating(builder); - builder.ConfigureMyProjectName(options => - { - options.TablePrefix = TablePrefix; - options.Schema = Schema; - }); + builder.ConfigureMyProjectName(); } } } \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs index c337573d14..c0f2a85865 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameDbContextModelCreatingExtensions.cs @@ -12,7 +12,10 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore { Check.NotNull(builder, nameof(builder)); - var options = new MyProjectNameModelBuilderConfigurationOptions(); + var options = new MyProjectNameModelBuilderConfigurationOptions( + MyProjectNameDbProperties.DbTablePrefix, + MyProjectNameDbProperties.DbSchema + ); optionsAction?.Invoke(options); diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs index 8f7af7fa89..445cde72b5 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs @@ -6,8 +6,8 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore public class MyProjectNameModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions { public MyProjectNameModelBuilderConfigurationOptions( - [NotNull] string tablePrefix = MyProjectNameConsts.DefaultDbTablePrefix, - [CanBeNull] string schema = MyProjectNameConsts.DefaultDbSchema) + [NotNull] string tablePrefix = "", + [CanBeNull] string schema = null) : base( tablePrefix, schema) diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/IMyProjectNameMongoDbContext.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/IMyProjectNameMongoDbContext.cs index d7def8491a..cb1a269091 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/IMyProjectNameMongoDbContext.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/IMyProjectNameMongoDbContext.cs @@ -3,7 +3,7 @@ using Volo.Abp.MongoDB; namespace MyCompanyName.MyProjectName.MongoDB { - [ConnectionStringName("MyProjectName")] + [ConnectionStringName(MyProjectNameDbProperties.ConnectionStringName)] public interface IMyProjectNameMongoDbContext : IAbpMongoDbContext { /* Define mongo collections here. Example: diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContext.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContext.cs index 5aee1f430e..82b1f54ea2 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContext.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContext.cs @@ -3,11 +3,9 @@ using Volo.Abp.MongoDB; namespace MyCompanyName.MyProjectName.MongoDB { - [ConnectionStringName("MyProjectName")] + [ConnectionStringName(MyProjectNameDbProperties.ConnectionStringName)] public class MyProjectNameMongoDbContext : AbpMongoDbContext, IMyProjectNameMongoDbContext { - public static string CollectionPrefix { get; set; } = MyProjectNameConsts.DefaultDbTablePrefix; - /* Add mongo collections here. Example: * public IMongoCollection Questions => Collection(); */ @@ -16,10 +14,7 @@ namespace MyCompanyName.MyProjectName.MongoDB { base.CreateModel(modelBuilder); - modelBuilder.ConfigureMyProjectName(options => - { - options.CollectionPrefix = CollectionPrefix; - }); + modelBuilder.ConfigureMyProjectName(); } } } \ No newline at end of file diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContextExtensions.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContextExtensions.cs index 34bfa02555..b71c77e231 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContextExtensions.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoDbContextExtensions.cs @@ -12,7 +12,9 @@ namespace MyCompanyName.MyProjectName.MongoDB { Check.NotNull(builder, nameof(builder)); - var options = new MyProjectNameMongoModelBuilderConfigurationOptions(); + var options = new MyProjectNameMongoModelBuilderConfigurationOptions( + MyProjectNameDbProperties.DbTablePrefix + ); optionsAction?.Invoke(options); } diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs index f06fec9e24..c0038f1f12 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs @@ -6,8 +6,8 @@ namespace MyCompanyName.MyProjectName.MongoDB public class MyProjectNameMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions { public MyProjectNameMongoModelBuilderConfigurationOptions( - [NotNull] string tablePrefix = MyProjectNameConsts.DefaultDbTablePrefix) - : base(tablePrefix) + [NotNull] string collectionPrefix = "") + : base(collectionPrefix) { } }