Module template db prefix change

templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Domain/MyProjectNameConsts.cs

@@ -1,9 +0,0 @@
-namespace MyCompanyName.MyProjectName
-{
-    public static class MyProjectNameConsts
-    {
-        public const string DefaultDbTablePrefix = "MyProjectName";
-
-        public const string DefaultDbSchema = null;
-    }
-}

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";
+    }
+}

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:

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<MyProjectNameDbContext>, 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<Question> Questions { get; set; }
          */
@@ -25,11 +21,7 @@ namespace MyCompanyName.MyProjectName.EntityFrameworkCore
         {
             base.OnModelCreating(builder);
 
-            builder.ConfigureMyProjectName(options =>
+            builder.ConfigureMyProjectName();
-            {
-                options.TablePrefix = TablePrefix;
-                options.Schema = Schema;
-            });
         }
     }
 }

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);
 

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,
+            [NotNull] string tablePrefix = "",
-            [CanBeNull] string schema = MyProjectNameConsts.DefaultDbSchema)
+            [CanBeNull] string schema = null)
             : base(
                 tablePrefix,
                 schema)

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:

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<Question> Questions => Collection<Question>();
          */
@@ -16,10 +14,7 @@ namespace MyCompanyName.MyProjectName.MongoDB
         {
             base.CreateModel(modelBuilder);
 
-            modelBuilder.ConfigureMyProjectName(options =>
+            modelBuilder.ConfigureMyProjectName();
-            {
-                options.CollectionPrefix = CollectionPrefix;
-            });
         }
     }
 }

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);
         }

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)
+            [NotNull] string collectionPrefix = "")
-            : base(tablePrefix)
+            : base(collectionPrefix)
         {
         }
     }