lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2026-01-22 21:01:59 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan
2024-01-08 12:40:25 +08:00
parent 24d6ccfb33
commit 064b3119ec
2 changed files with 51 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
Src/Asp.Net/SqlSugar/Abstract/UpdateProvider/UpdateableHelper.cs
View File

@@ -725,6 +725,8 @@ namespace SqlSugar
item.TableName = this.EntityInfo.DbTableName; item.TableName = this.EntityInfo.DbTableName;
item.Columns = new List<DiffLogColumnInfo>(); item.Columns = new List<DiffLogColumnInfo>();
foreach (DataColumn col in dt.Columns) foreach (DataColumn col in dt.Columns)
{
try
{ {
var sugarColumn = this.EntityInfo.Columns.Where(it => it.DbColumnName != null).First(it => var sugarColumn = this.EntityInfo.Columns.Where(it => it.DbColumnName != null).First(it =>
it.DbColumnName.Equals(col.ColumnName, StringComparison.CurrentCultureIgnoreCase)); it.DbColumnName.Equals(col.ColumnName, StringComparison.CurrentCultureIgnoreCase));
@@ -735,6 +737,11 @@ namespace SqlSugar
addItem.ColumnDescription = sugarColumn.ColumnDescription; addItem.ColumnDescription = sugarColumn.ColumnDescription;
item.Columns.Add(addItem); item.Columns.Add(addItem);
} }
catch (Exception ex)
{
Check.ExceptionEasy(col.ColumnName + " No corresponding entity attribute found in difference log ."+ex.Message, col.ColumnName + "在差异日志中可能没有找到相应的实体属性,详细:"+ex.Message);
}
}
result.Add(item); result.Add(item);
} }
} }

36
Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/SubqueryableN.cs
View File

@@ -446,14 +446,38 @@ namespace SqlSugar
{ {
return this; return this;
} }
public Subqueryable<T1, T2, T3> OrderBy(Func<T1, T2, object> expression)
{
return this;
}
public new Subqueryable<T1, T2, T3> OrderBy(Func<T1, object> expression)
{
return this;
}
public Subqueryable<T1, T2,T3> OrderByDesc(Func<T1, T2,T3, object> expression) public Subqueryable<T1, T2,T3> OrderByDesc(Func<T1, T2,T3, object> expression)
{ {
return this; return this;
} }
public Subqueryable<T1, T2, T3> OrderByDesc(Func<T1, T2, object> expression)
{
return this;
}
public new Subqueryable<T1, T2, T3> OrderByDesc(Func<T1,object> expression)
{
return this;
}
public Subqueryable<T1, T2,T3> GroupBy(Func<T1, T2,T3, object> expression) public Subqueryable<T1, T2,T3> GroupBy(Func<T1, T2,T3, object> expression)
{ {
return this; return this;
} }
public Subqueryable<T1, T2, T3> GroupBy(Func<T1, T2, object> expression)
{
return this;
}
public new Subqueryable<T1, T2, T3> GroupBy(Func<T1,object> expression)
{
return this;
}
public TResult Select<TResult>(Func<T1, T2,T3, TResult> expression) where TResult : struct public TResult Select<TResult>(Func<T1, T2,T3, TResult> expression) where TResult : struct
{ {
return default(TResult); return default(TResult);
@@ -550,14 +574,26 @@ namespace SqlSugar
{ {
return this; return this;
} }
public new Subqueryable<T1, T2> OrderBy(Func<T1,object> expression)
{
return this;
}
public Subqueryable<T1,T2> OrderByDesc(Func<T1,T2, object> expression) public Subqueryable<T1,T2> OrderByDesc(Func<T1,T2, object> expression)
{ {
return this; return this;
} }
public new Subqueryable<T1, T2> OrderByDesc(Func<T1,object> expression)
{
return this;
}
public Subqueryable<T1,T2> GroupBy(Func<T1,T2, object> expression) public Subqueryable<T1,T2> GroupBy(Func<T1,T2, object> expression)
{ {
return this; return this;
} }
public new Subqueryable<T1, T2> GroupBy(Func<T1, object> expression)
{
return this;
}
public Subqueryable<T1,T2> WhereIF(bool isWhere, Func<T1, T2, bool> expression) public Subqueryable<T1,T2> WhereIF(bool isWhere, Func<T1, T2, bool> expression)
{ {
return this; return this;