优化临时表功能

izanhzh · Jul 17, 2024 · 2e9944a · 2e9944a
1 parent ba04a6f
commit 2e9944a
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 13 deletions.
diff --git a/framework/Directory.Build.props b/framework/Directory.Build.props
@@ -2,7 +2,7 @@
 	<PropertyGroup>
 		<RootNamespace>Amos.Abp</RootNamespace>
 		<Authors>Amos</Authors>
-		<Version>2.0.1</Version>
+		<Version>2.0.2</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<PackageLicenseExpression>MIT</PackageLicenseExpression>
 		<PackageReadmeFile>README.md</PackageReadmeFile>

diff --git a/framework/src/Amos.Abp.TempTable/EntityFrameworkCore/ModelBuilderExtension.cs b/framework/src/Amos.Abp.TempTable/EntityFrameworkCore/ModelBuilderExtension.cs
@@ -1,5 +1,7 @@
-using Amos.Abp.TempTable.EntityFrameworkCore;
+using Amos.Abp.TempTable;
+using Amos.Abp.TempTable.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore;
+using System;
 using Volo.Abp.EntityFrameworkCore;
 using Volo.Abp.EntityFrameworkCore.Modeling;
 
@@ -18,18 +20,33 @@ public static void AutoAddTempTableToModel<TDbContext>(this ModelBuilder modelBu
             var tempTables = TempTableFinder.GetAutoAddTempTables(typeof(TDbContext));
             foreach (var tempTable in tempTables)
             {
-                var isExists = modelBuilder.Model.FindEntityType(tempTable) != null;
-                if (!isExists)
+                modelBuilder.AddTempTableToModel(tempTable);
+            }
+        }
+
+        /// <summary>
+        /// Note: Call it before base.OnModelCreating
+        /// </summary>
+        /// <typeparam name="TTempTable"></typeparam>
+        /// <param name="modelBuilder"></param>
+        public static void AddTempTableToModel<TTempTable>(this ModelBuilder modelBuilder) where TTempTable : ITempTable
+        {
+            modelBuilder.AddTempTableToModel(typeof(TTempTable));
+        }
+
+        internal static void AddTempTableToModel(this ModelBuilder modelBuilder, Type tempTableType)
+        {
+            var isExists = modelBuilder.Model.FindEntityType(tempTableType) != null;
+            if (!isExists)
+            {
+                modelBuilder.Model.AddEntityType(tempTableType);
+                modelBuilder.Entity(tempTableType, (b) =>
                 {
-                    modelBuilder.Model.AddEntityType(tempTable);
-                    modelBuilder.Entity(tempTable, (b) =>
-                    {
-                        //b.ToView(null);
-                        b.ToTable("TempTable_" + tempTable.Name, (t) => t.ExcludeFromMigrations());
-                        b.HasNoKey();
-                        b.ConfigureByConvention();
-                    });
-                }
+                    //b.ToView(null);
+                    b.ToTable("TempTable_" + tempTableType.Name, (t) => t.ExcludeFromMigrations());
+                    b.HasNoKey();
+                    b.ConfigureByConvention();
+                });
             }
         }
     }