tk/FreeSql
1
0
Fork 0
mirror of https://github.com/nsnail/FreeSql.git synced 2025-06-18 20:08:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

v3.2.807 #1698 #1694 #1691 #1688 #1681 #1680 #1521 #1676 #1568

Browse Source
This commit is contained in:
2881099
2023-12-20 19:09:22 +08:00
parent 0ca4b7e7d0
commit b0a3f79e63
36 changed files with 44 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
FreeSql.DbContext/DbSet/DbSet.cs
View File

@ -349,12 +349,13 @@ namespace FreeSql
}
else
{
if (_states.ContainsKey(key))
{
if (isThrow) throw new Exception(DbContextStrings.CannotAdd_AlreadyExistsInStateManagement(_db.OrmOriginal.GetEntityString(_entityType, data)));
return false;
}
if (_db.OrmOriginal.Ado.DataType == DataType.ClickHouse) return true;
//不可添加，已存在于状态管理
//if (_states.ContainsKey(key))
//{
// if (isThrow) throw new Exception(DbContextStrings.CannotAdd_AlreadyExistsInStateManagement(_db.OrmOriginal.GetEntityString(_entityType, data)));
// return false;
//}
if (_db.OrmOriginal.Ado.DataType == DataType.ClickHouse) return true;
var idval = _db.OrmOriginal.GetEntityIdentityValueWithPrimary(_entityType, data);
if (idval > 0)
{

2
FreeSql.DbContext/FreeSql.DbContext.csproj
View File

@ -17,7 +17,7 @@
<SignAssembly>true</SignAssembly>
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<Version>3.2.807-preview20231220</Version>
<Version>3.2.807</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

9
FreeSql.DbContext/FreeSql.DbContext.xml
View File

@ -806,14 +806,5 @@
<param name="that"></param>
<returns></returns>
</member>
<member name="M:Microsoft.Extensions.DependencyInjection.FreeSqlRepositoryDependencyInjection.AddFreeRepository(Microsoft.Extensions.DependencyInjection.IServiceCollection,System.Action{FreeSql.FluentDataFilter},System.Reflection.Assembly[])">
<summary>
批量注入 Repository，可以参考代码自行调整
</summary>
<param name="services"></param>
<param name="globalDataFilter"></param>
<param name="assemblies"></param>
<returns></returns>
</member>
</members>
</doc>