- 修复 WithMemory 对 InsertValueSql 属性无效的问题；

dotnetcore · Feb 5, 2024 · 91362ad · 91362ad
1 parent 49c8996
commit 91362ad
Show file tree

Hide file tree

Showing 5 changed files with 118 additions and 103 deletions.
diff --git a/...sions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepository.cs b/...sions/FreeSql.Extensions.AggregateRoot/AggregateRootRepository/AggregateRootRepository.cs
@@ -119,11 +119,12 @@ public void FlushState()
         public ISelect<TEntity> WhereIf(bool condition, Expression<Func<TEntity, bool>> exp) => Select.WhereIf(condition, exp);
 
         readonly Dictionary<Type, IBaseRepository<object>> _childRepositorys = new Dictionary<Type, IBaseRepository<object>>();
+        protected virtual IFreeSql GetChildFreeSql(Type type) => Orm;
         IBaseRepository<object> GetChildRepository(Type type)
         {
             if (_childRepositorys.TryGetValue(type, out var repo) == false)
             {
-                repo = Orm.GetRepository<object>();
+                repo = GetChildFreeSql(type).GetRepository<object>();
                 repo.AsType(type);
                 _childRepositorys.Add(type, repo);
             }

diff --git a/Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj b/Extensions/FreeSql.Extensions.AggregateRoot/FreeSql.Extensions.AggregateRoot.csproj
@@ -18,7 +18,7 @@
 		<SignAssembly>true</SignAssembly>
 		<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
 		<DelaySign>false</DelaySign>
-		<Version>3.2.812</Version>
+		<Version>3.2.813-preview20240205</Version>
 		<PackageReadmeFile>readme.md</PackageReadmeFile>
 	</PropertyGroup>
 

diff --git a/FreeSql/FreeSql.xml b/FreeSql/FreeSql.xml
diff --git a/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs b/FreeSql/Internal/CommonProvider/InsertOrUpdateProvider.cs
@@ -264,7 +264,7 @@ public IInsertOrUpdate<T1> AsType(Type entityType)
             return this;
         }
 
-        public void WriteSourceSelectUnionAll(List<T1> source, StringBuilder sb, List<DbParameter> dbParams)
+        public void WriteSourceSelectUnionAll(List<T1> source, StringBuilder sb, List<DbParameter> dbParams, bool disableInsertValueSql = false)
         {
             if (_sourceSql != null)
             {
@@ -287,7 +287,7 @@ public void WriteSourceSelectUnionAll(List<T1> source, StringBuilder sb, List<Db
                 foreach (var col in _table.Columns.Values)
                 {
                     if (colidx2 > 0) sb.Append(", ");
-                    if (string.IsNullOrEmpty(col.DbInsertValue) == false)
+                    if (disableInsertValueSql == false && string.IsNullOrEmpty(col.DbInsertValue) == false)
                         sb.Append(col.DbInsertValue);
                     else
                     {

diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs
@@ -529,7 +529,7 @@ public ISelect<T1> WithMemory(IEnumerable<T1> source)
             if (list.Any() != true) throw new Exception(CoreStrings.Cannot_Be_NULL_Name(nameof(source)));
 			var sb = new StringBuilder();
             (_orm.InsertOrUpdate<object>().AsType(_tables[0].Table.Type) as InsertOrUpdateProvider<object>)
-                .WriteSourceSelectUnionAll(list, sb, _params);
+                .WriteSourceSelectUnionAll(list, sb, _params, true);
 
             try { return WithSql(sb.ToString()); }
             finally { sb.Clear(); }