PermissionManagement db table prefix revision

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementConsts.cs

@@ -1,11 +0,0 @@
-namespace Volo.Abp.PermissionManagement
-{
-    public static class AbpPermissionManagementConsts
-    {
-        public const string DefaultDbTablePrefix = "Abp";
-
-        public const string DefaultDbSchema = null;
-
-        public const string ConnectionStringName = "AbpPermissionManagement";
-    }
-}

modules/permission-management/src/Volo.Abp.PermissionManagement.Domain/Volo/Abp/PermissionManagement/AbpPermissionManagementDbProperties.cs

@@ -0,0 +1,13 @@
+using Volo.Abp.Data;
+
+namespace Volo.Abp.PermissionManagement
+{
+    public static class AbpPermissionManagementDbProperties
+    {
+        public static string DbTablePrefix { get; } = AbpCommonDbProperties.DbTablePrefix;
+
+        public static string DbSchema { get; } = AbpCommonDbProperties.DbSchema;
+
+        public const string ConnectionStringName = "AbpPermissionManagement";
+    }
+}

modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/AbpPermissionManagementDbContextModelBuilderExtensions.cs

@@ -1,4 +1,5 @@
-using JetBrains.Annotations;
+using System;
+using JetBrains.Annotations;
 using Microsoft.EntityFrameworkCore;
 
 namespace Volo.Abp.PermissionManagement.EntityFrameworkCore
@@ -7,19 +8,20 @@ namespace Volo.Abp.PermissionManagement.EntityFrameworkCore
     {
         public static void ConfigurePermissionManagement(
             [NotNull] this ModelBuilder builder,
-            [CanBeNull] string tablePrefix = AbpPermissionManagementConsts.DefaultDbTablePrefix,
-            [CanBeNull] string schema = AbpPermissionManagementConsts.DefaultDbSchema)
+            [CanBeNull] Action<AbpPermissionManagementModelBuilderConfigurationOptions> optionsAction = null)
         {
             Check.NotNull(builder, nameof(builder));
 
-            if (tablePrefix == null)
-            {
-                tablePrefix = "";
-            }
+            var options = new AbpPermissionManagementModelBuilderConfigurationOptions(
+                AbpPermissionManagementDbProperties.DbTablePrefix,
+                AbpPermissionManagementDbProperties.DbSchema
+            );
+
+            optionsAction?.Invoke(options);
 
             builder.Entity<PermissionGrant>(b =>
             {
-                b.ToTable(tablePrefix + "PermissionGrants", schema);
+                b.ToTable(options.TablePrefix + "PermissionGrants", options.Schema);
 
                 b.Property(x => x.Name).HasMaxLength(PermissionGrantConsts.MaxNameLength).IsRequired();
                 b.Property(x => x.ProviderName).HasMaxLength(PermissionGrantConsts.MaxProviderNameLength).IsRequired();

modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/AbpPermissionManagementModelBuilderConfigurationOptions.cs

@@ -0,0 +1,18 @@
+using JetBrains.Annotations;
+using Volo.Abp.EntityFrameworkCore.Modeling;
+
+namespace Volo.Abp.PermissionManagement.EntityFrameworkCore
+{
+    public class AbpPermissionManagementModelBuilderConfigurationOptions : ModelBuilderConfigurationOptions
+    {
+        public AbpPermissionManagementModelBuilderConfigurationOptions(
+            [NotNull] string tablePrefix,
+            [CanBeNull] string schema)
+            : base(
+                tablePrefix,
+                schema)
+        {
+
+        }
+    }
+}

modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/IPermissionManagementDbContext.cs

@@ -4,7 +4,7 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace Volo.Abp.PermissionManagement.EntityFrameworkCore
 {
-    [ConnectionStringName(AbpPermissionManagementConsts.ConnectionStringName)]
+    [ConnectionStringName(AbpPermissionManagementDbProperties.ConnectionStringName)]
     public interface IPermissionManagementDbContext : IEfCoreDbContext
     {
         DbSet<PermissionGrant> PermissionGrants { get; set; }

modules/permission-management/src/Volo.Abp.PermissionManagement.EntityFrameworkCore/Volo/Abp/PermissionManagement/EntityFrameworkCore/PermissionManagementDbContext.cs

@@ -4,13 +4,9 @@ using Volo.Abp.EntityFrameworkCore;
 
 namespace Volo.Abp.PermissionManagement.EntityFrameworkCore
 {
-    [ConnectionStringName(AbpPermissionManagementConsts.ConnectionStringName)]
+    [ConnectionStringName(AbpPermissionManagementDbProperties.ConnectionStringName)]
     public class PermissionManagementDbContext : AbpDbContext<PermissionManagementDbContext>, IPermissionManagementDbContext
     {
-        public static string TablePrefix { get; set; } = AbpPermissionManagementConsts.DefaultDbTablePrefix;
-
-        public static string Schema { get; set; } = AbpPermissionManagementConsts.DefaultDbSchema;
-
         public DbSet<PermissionGrant> PermissionGrants { get; set; }
 
         public PermissionManagementDbContext(DbContextOptions<PermissionManagementDbContext> options)
@@ -23,7 +19,7 @@ namespace Volo.Abp.PermissionManagement.EntityFrameworkCore
         {
             base.OnModelCreating(builder);
 
-            builder.ConfigurePermissionManagement(TablePrefix, Schema);
+            builder.ConfigurePermissionManagement();
         }
     }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/AbpPermissionManagementMongoDbContextExtensions.cs

@@ -11,7 +11,9 @@ namespace Volo.Abp.PermissionManagement.MongoDB
         {
             Check.NotNull(builder, nameof(builder));
 
-            var options = new PermissionManagementMongoModelBuilderConfigurationOptions();
+            var options = new PermissionManagementMongoModelBuilderConfigurationOptions(
+                AbpPermissionManagementDbProperties.DbTablePrefix
+            );
 
             optionsAction?.Invoke(options);
 

modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/IPermissionManagementMongoDbContext.cs

@@ -4,7 +4,7 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.PermissionManagement.MongoDB
 {
-    [ConnectionStringName(AbpPermissionManagementConsts.ConnectionStringName)]
+    [ConnectionStringName(AbpPermissionManagementDbProperties.ConnectionStringName)]
     public interface IPermissionManagementMongoDbContext : IAbpMongoDbContext
     {
         IMongoCollection<PermissionGrant> PermissionGrants { get; }

modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/PermissionManagementMongoDbContext.cs

@@ -4,21 +4,16 @@ using Volo.Abp.MongoDB;
 
 namespace Volo.Abp.PermissionManagement.MongoDB
 {
-    [ConnectionStringName(AbpPermissionManagementConsts.ConnectionStringName)]
+    [ConnectionStringName(AbpPermissionManagementDbProperties.ConnectionStringName)]
     public class PermissionManagementMongoDbContext : AbpMongoDbContext, IPermissionManagementMongoDbContext
     {
-        public static string CollectionPrefix { get; set; } = AbpPermissionManagementConsts.DefaultDbTablePrefix;
-
         public IMongoCollection<PermissionGrant> PermissionGrants => Collection<PermissionGrant>();
 
         protected override void CreateModel(IMongoModelBuilder modelBuilder)
         {
             base.CreateModel(modelBuilder);
 
-            modelBuilder.ConfigurePermissionManagement(options =>
-            {
-                options.CollectionPrefix = CollectionPrefix;
-            });
+            modelBuilder.ConfigurePermissionManagement();
         }
     }
 }

modules/permission-management/src/Volo.Abp.PermissionManagement.MongoDB/Volo/Abp/PermissionManagement/MongoDb/PermissionManagementMongoModelBuilderConfigurationOptions.cs

@@ -5,7 +5,8 @@ namespace Volo.Abp.PermissionManagement.MongoDB
 {
     public class PermissionManagementMongoModelBuilderConfigurationOptions : MongoModelBuilderConfigurationOptions
     {
-        public PermissionManagementMongoModelBuilderConfigurationOptions([NotNull] string tablePrefix = AbpPermissionManagementConsts.DefaultDbTablePrefix)
+        public PermissionManagementMongoModelBuilderConfigurationOptions(
+            [NotNull] string tablePrefix = "")
             : base(tablePrefix)
         {
         }