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

View File

@ -18,7 +18,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>

View File

@ -19,7 +19,7 @@
<AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
<DelaySign>false</DelaySign>
<LangVersion>latest</LangVersion>
<Version>3.2.807-preview20231220</Version>
<Version>3.2.807</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

View File

@ -18,7 +18,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>

View File

@ -15,7 +15,7 @@
<Title>$(AssemblyName)</Title>
<IsPackable>true</IsPackable>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<Version>3.2.807-preview20231220</Version>
<Version>3.2.807</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>

View File

@ -18,7 +18,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>

View File

@ -18,7 +18,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>

View File

@ -770,11 +770,11 @@ ManyToMany 级联删除中间表(注意不删除外部根)
}
else
{
if (_states.ContainsKey(key))
{
if (isThrow) throw new Exception($"不可添加,已存在于状态管理:{GetEntityString(table, data)}");
return false;
}
//if (_states.ContainsKey(key))
//{
// if (isThrow) throw new Exception($"不可添加,已存在于状态管理:{GetEntityString(table, data)}");
// return false;
//}
if (_orm.Ado.DataType == DataType.ClickHouse) return true;
var idcol = table.Primarys.FirstOrDefault(a => a.Attribute.IsIdentity);
if (table.Primarys.Any(a => a.Attribute.IsIdentity))

View File

@ -13,7 +13,7 @@
<PackageProjectUrl>https://github.com/2881099/FreeSql</PackageProjectUrl>
<RepositoryUrl>https://github.com/2881099/FreeSql</RepositoryUrl>
<PackageTags>FreeSql DbFirst 实体生成器</PackageTags>
<Version>3.2.807-preview20231220</Version>
<Version>3.2.807</Version>
<PackageReadmeFile>readme.md</PackageReadmeFile>
</PropertyGroup>