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

Merge branch 'dotnetcore:master' into dev

Browse Source
This commit is contained in:
IGeekFan
2021-12-24 20:05:20 +08:00
committed by GitHub
parent c88706be3c a979f96bff
commit 10803638f2
139 changed files with 16381 additions and 341 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
FreeSql.DbContext/DbContext/DbContext.cs
View File

@ -217,7 +217,7 @@ namespace FreeSql
/// 比较实体，计算出值发生变化的属性，以及属性变化的前后值
/// </summary>
/// <param name="newdata">最新的实体对象，它将与附加实体的状态对比</param>
/// <returns></returns>
/// <returns>key: 属性名, value: [旧值, 新值]</returns>
public Dictionary<string, object[]> CompareState<TEntity>(TEntity newdata) where TEntity : class
{
CheckEntityTypeOrThrow(typeof(TEntity));

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

@ -223,7 +223,7 @@ namespace FreeSql
/// 比较实体，计算出值发生变化的属性，以及属性变化的前后值
/// </summary>
/// <param name="newdata">最新的实体对象，它将与附加实体的状态对比</param>
/// <returns></returns>
/// <returns>key: 属性名, value: [旧值, 新值]</returns>
public Dictionary<string, object[]> CompareState(TEntity newdata)
{
if (newdata == null) return null;
@ -305,6 +305,7 @@ namespace FreeSql
case DataType.KingbaseES:
case DataType.OdbcKingbaseES:
case DataType.ShenTong:
case DataType.ClickHouse:
return true;
default:
if (_tableIdentitys.Length == 1 && _table.Primarys.Length == 1)
@ -320,6 +321,7 @@ namespace FreeSql
if (isThrow) throw new Exception($"不可添加，已存在于状态管理：{_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

@ -2,7 +2,7 @@
<PropertyGroup>
<TargetFrameworks>netstandard2.0;net60;net50;netcoreapp31;netcoreapp21;net45;net40</TargetFrameworks>
<Version>2.6.100</Version>
<Version>3.0.100</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Authors>FreeSql;ncc;YeXiangQin</Authors>
<Description>FreeSql is the ORM in .NetCore, .NetFramework, And Xamarin. It supports Mysql, Postgresql, SqlServer, Oracle, Sqlite, Firebird, Odbc, 达梦, 人大金仓, 神舟通用, 翰高, And Access</Description>

6
FreeSql.DbContext/FreeSql.DbContext.xml
View File

@ -67,7 +67,7 @@
比较实体，计算出值发生变化的属性，以及属性变化的前后值
</summary>
<param name="newdata">最新的实体对象，它将与附加实体的状态对比</param>
<returns></returns>
<returns>key: 属性名, value: [旧值, 新值]</returns>
</member>
<member name="P:FreeSql.DbContext.EntityChangeReport.ChangeInfo.BeforeObject">
<summary>
@ -142,7 +142,7 @@
比较实体，计算出值发生变化的属性，以及属性变化的前后值
</summary>
<param name="newdata">最新的实体对象，它将与附加实体的状态对比</param>
<returns></returns>
<returns>key: 属性名, value: [旧值, 新值]</returns>
</member>
<member name="M:FreeSql.DbSet`1.FlushState">
<summary>
@ -333,7 +333,7 @@
比较实体，计算出值发生变化的属性，以及属性变化的前后值
</summary>
<param name="newdata">最新的实体对象，它将与附加实体的状态对比</param>
<returns></returns>
<returns>key: 属性名, value: [旧值, 新值]</returns>
</member>
<member name="M:FreeSql.IBaseRepository`1.SaveMany(`0,System.String)">
<summary>

2
FreeSql.DbContext/Repository/Repository/BaseRepository.cs
View File

@ -40,7 +40,7 @@ namespace FreeSql
{
_dbsetPriv?.Dispose();
_dbPriv?.Dispose();
this.DataFilter.Dispose();
this.DataFilter?.Dispose();
}
finally
{

2
FreeSql.DbContext/Repository/Repository/IBaseRepository.cs
View File

@ -62,7 +62,7 @@ namespace FreeSql
/// 比较实体，计算出值发生变化的属性，以及属性变化的前后值
/// </summary>
/// <param name="newdata">最新的实体对象，它将与附加实体的状态对比</param>
/// <returns></returns>
/// <returns>key: 属性名, value: [旧值, 新值]</returns>
Dictionary<string, object[]> CompareState(TEntity newdata);
int Update(TEntity entity);