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 0e1e01628d..d8489151e4 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 @@ -1,5 +1,4 @@ -using System; -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using Volo.Abp; namespace MyCompanyName.MyProjectName.EntityFrameworkCore @@ -7,30 +6,22 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore public static class MyProjectNameDbContextModelCreatingExtensions { public static void ConfigureMyProjectName( - this ModelBuilder builder, - Action optionsAction = null) + this ModelBuilder builder) { Check.NotNull(builder, nameof(builder)); - var options = new MyProjectNameModelBuilderConfigurationOptions( - MyProjectNameDbProperties.DbTablePrefix, - MyProjectNameDbProperties.DbSchema - ); - - optionsAction?.Invoke(options); - /* Configure all entities here. Example: builder.Entity(b => { //Configure table & schema name - b.ToTable(options.TablePrefix + "Questions", options.Schema); - + b.ToTable(MyProjectNameDbProperties.DbTablePrefix + "Questions", MyProjectNameDbProperties.DbSchema); + b.ConfigureByConvention(); - + //Properties b.Property(q => q.Title).IsRequired().HasMaxLength(QuestionConsts.MaxTitleLength); - + //Relations b.HasMany(question => question.Tags).WithOne().HasForeignKey(qt => qt.QuestionId); @@ -40,4 +31,4 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore */ } } -} \ No newline at end of file +} 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 deleted file mode 100644 index 8b3c2a49dd..0000000000 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.EntityFrameworkCore/EntityFrameworkCore/MyProjectNameModelBuilderConfigurationOptions.cs +++ /dev/null @@ -1,18 +0,0 @@ -using JetBrains.Annotations; -using Volo.Abp.EntityFrameworkCore.Modeling; - -namespace MyCompanyName.MyProjectName.EntityFrameworkCore -{ - public class MyProjectNameModelBuilderConfigurationOptions : AbpModelBuilderConfigurationOptions - { - public MyProjectNameModelBuilderConfigurationOptions( - [NotNull] string tablePrefix = "", - [CanBeNull] string schema = null) - : base( - tablePrefix, - schema) - { - - } - } -} \ 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 4dca336b5e..a66e949d4e 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 @@ -1,5 +1,4 @@ -using System; -using Volo.Abp; +using Volo.Abp; using Volo.Abp.MongoDB; namespace MyCompanyName.MyProjectName.MongoDB @@ -7,16 +6,9 @@ namespace MyCompanyName.MyProjectName.MongoDB public static class MyProjectNameMongoDbContextExtensions { public static void ConfigureMyProjectName( - this IMongoModelBuilder builder, - Action optionsAction = null) + this IMongoModelBuilder builder) { Check.NotNull(builder, nameof(builder)); - - var options = new MyProjectNameMongoModelBuilderConfigurationOptions( - MyProjectNameDbProperties.DbTablePrefix - ); - - optionsAction?.Invoke(options); } } -} \ No newline at end of file +} 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 deleted file mode 100644 index c40728fefa..0000000000 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.MongoDB/MongoDB/MyProjectNameMongoModelBuilderConfigurationOptions.cs +++ /dev/null @@ -1,14 +0,0 @@ -using JetBrains.Annotations; -using Volo.Abp.MongoDB; - -namespace MyCompanyName.MyProjectName.MongoDB -{ - public class MyProjectNameMongoModelBuilderConfigurationOptions : AbpMongoModelBuilderConfigurationOptions - { - public MyProjectNameMongoModelBuilderConfigurationOptions( - [NotNull] string collectionPrefix = "") - : base(collectionPrefix) - { - } - } -} \ No newline at end of file