mirror of
https://gitee.com/dotnetchina/SqlSugar.git
synced 2025-09-20 02:29:39 +08:00
Synchronization code
This commit is contained in:
@@ -269,6 +269,10 @@ namespace SqlSugar
|
|||||||
var columnsResult = this.Context.EntityMaintenance.GetEntityInfo<TResult>().Columns;
|
var columnsResult = this.Context.EntityMaintenance.GetEntityInfo<TResult>().Columns;
|
||||||
sql = AppendSelect<T>(sql, parameters, columnsResult, 0);
|
sql = AppendSelect<T>(sql, parameters, columnsResult, 0);
|
||||||
sql = AppendSelect<T2>(sql, parameters, columnsResult, 1);
|
sql = AppendSelect<T2>(sql, parameters, columnsResult, 1);
|
||||||
|
if (sql.Trim().First()==',')
|
||||||
|
{
|
||||||
|
sql = sql.TrimStart(' ').TrimStart(',');
|
||||||
|
}
|
||||||
return this.Select<TResult>(sql);
|
return this.Select<TResult>(sql);
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
@@ -983,6 +987,10 @@ namespace SqlSugar
|
|||||||
sql = AppendSelect<T>(sql, parameters, columnsResult, 0);
|
sql = AppendSelect<T>(sql, parameters, columnsResult, 0);
|
||||||
sql = AppendSelect<T2>(sql, parameters, columnsResult, 1);
|
sql = AppendSelect<T2>(sql, parameters, columnsResult, 1);
|
||||||
sql = AppendSelect<T3>(sql, parameters, columnsResult, 2);
|
sql = AppendSelect<T3>(sql, parameters, columnsResult, 2);
|
||||||
|
if (sql.Trim().First() == ',')
|
||||||
|
{
|
||||||
|
sql = sql.TrimStart(' ').TrimStart(',');
|
||||||
|
}
|
||||||
return this.Select<TResult>(sql);
|
return this.Select<TResult>(sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1595,6 +1603,10 @@ namespace SqlSugar
|
|||||||
sql = AppendSelect<T2>(sql, parameters, columnsResult, 1);
|
sql = AppendSelect<T2>(sql, parameters, columnsResult, 1);
|
||||||
sql = AppendSelect<T3>(sql, parameters, columnsResult, 2);
|
sql = AppendSelect<T3>(sql, parameters, columnsResult, 2);
|
||||||
sql = AppendSelect<T4>(sql, parameters, columnsResult, 3);
|
sql = AppendSelect<T4>(sql, parameters, columnsResult, 3);
|
||||||
|
if (sql.Trim().First() == ',')
|
||||||
|
{
|
||||||
|
sql = sql.TrimStart(' ').TrimStart(',');
|
||||||
|
}
|
||||||
return this.Select<TResult>(sql);
|
return this.Select<TResult>(sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2346,6 +2358,10 @@ namespace SqlSugar
|
|||||||
sql = AppendSelect<T3>(sql, parameters, columnsResult, 2);
|
sql = AppendSelect<T3>(sql, parameters, columnsResult, 2);
|
||||||
sql = AppendSelect<T4>(sql, parameters, columnsResult, 3);
|
sql = AppendSelect<T4>(sql, parameters, columnsResult, 3);
|
||||||
sql = AppendSelect<T5>(sql, parameters, columnsResult, 4);
|
sql = AppendSelect<T5>(sql, parameters, columnsResult, 4);
|
||||||
|
if (sql.Trim().First() == ',')
|
||||||
|
{
|
||||||
|
sql = sql.TrimStart(' ').TrimStart(',');
|
||||||
|
}
|
||||||
return this.Select<TResult>(sql);
|
return this.Select<TResult>(sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -329,6 +329,10 @@ namespace SqlSugar
|
|||||||
sql = AppendSelect<T4>(sql, parameters, columnsResult, 3);
|
sql = AppendSelect<T4>(sql, parameters, columnsResult, 3);
|
||||||
sql = AppendSelect<T5>(sql, parameters, columnsResult, 4);
|
sql = AppendSelect<T5>(sql, parameters, columnsResult, 4);
|
||||||
sql = AppendSelect<T6>(sql, parameters, columnsResult, 5);
|
sql = AppendSelect<T6>(sql, parameters, columnsResult, 5);
|
||||||
|
if (sql.Trim().First() == ',')
|
||||||
|
{
|
||||||
|
sql = sql.TrimStart(' ').TrimStart(',');
|
||||||
|
}
|
||||||
return this.Select<TResult>(sql);
|
return this.Select<TResult>(sql);
|
||||||
}
|
}
|
||||||
#endregion
|
#endregion
|
||||||
@@ -1058,6 +1062,10 @@ namespace SqlSugar
|
|||||||
sql = AppendSelect<T5>(sql, parameters, columnsResult, 4);
|
sql = AppendSelect<T5>(sql, parameters, columnsResult, 4);
|
||||||
sql = AppendSelect<T6>(sql, parameters, columnsResult, 5);
|
sql = AppendSelect<T6>(sql, parameters, columnsResult, 5);
|
||||||
sql = AppendSelect<T7>(sql, parameters, columnsResult, 6);
|
sql = AppendSelect<T7>(sql, parameters, columnsResult, 6);
|
||||||
|
if (sql.Trim().First() == ',')
|
||||||
|
{
|
||||||
|
sql = sql.TrimStart(' ').TrimStart(',');
|
||||||
|
}
|
||||||
return this.Select<TResult>(sql);
|
return this.Select<TResult>(sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1794,6 +1802,10 @@ namespace SqlSugar
|
|||||||
sql = AppendSelect<T6>(sql, parameters, columnsResult, 5);
|
sql = AppendSelect<T6>(sql, parameters, columnsResult, 5);
|
||||||
sql = AppendSelect<T7>(sql, parameters, columnsResult, 6);
|
sql = AppendSelect<T7>(sql, parameters, columnsResult, 6);
|
||||||
sql = AppendSelect<T8>(sql, parameters, columnsResult, 7);
|
sql = AppendSelect<T8>(sql, parameters, columnsResult, 7);
|
||||||
|
if (sql.Trim().First() == ',')
|
||||||
|
{
|
||||||
|
sql = sql.TrimStart(' ').TrimStart(',');
|
||||||
|
}
|
||||||
return this.Select<TResult>(sql);
|
return this.Select<TResult>(sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -2444,6 +2456,10 @@ namespace SqlSugar
|
|||||||
sql = AppendSelect<T7>(sql, parameters, columnsResult, 6);
|
sql = AppendSelect<T7>(sql, parameters, columnsResult, 6);
|
||||||
sql = AppendSelect<T8>(sql, parameters, columnsResult, 7);
|
sql = AppendSelect<T8>(sql, parameters, columnsResult, 7);
|
||||||
sql = AppendSelect<T9>(sql, parameters, columnsResult, 8);
|
sql = AppendSelect<T9>(sql, parameters, columnsResult, 8);
|
||||||
|
if (sql.Trim().First() == ',')
|
||||||
|
{
|
||||||
|
sql = sql.TrimStart(' ').TrimStart(',');
|
||||||
|
}
|
||||||
return this.Select<TResult>(sql);
|
return this.Select<TResult>(sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -3131,6 +3147,10 @@ namespace SqlSugar
|
|||||||
sql = AppendSelect<T8>(sql, parameters, columnsResult, 7);
|
sql = AppendSelect<T8>(sql, parameters, columnsResult, 7);
|
||||||
sql = AppendSelect<T9>(sql, parameters, columnsResult, 8);
|
sql = AppendSelect<T9>(sql, parameters, columnsResult, 8);
|
||||||
sql = AppendSelect<T10>(sql, parameters, columnsResult, 9);
|
sql = AppendSelect<T10>(sql, parameters, columnsResult, 9);
|
||||||
|
if (sql.Trim().First() == ',')
|
||||||
|
{
|
||||||
|
sql = sql.TrimStart(' ').TrimStart(',');
|
||||||
|
}
|
||||||
return this.Select<TResult>(sql);
|
return this.Select<TResult>(sql);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -324,6 +324,10 @@ namespace SqlSugar
|
|||||||
sql = AppendSelect<T9>(sql, parameters, columnsResult, 8);
|
sql = AppendSelect<T9>(sql, parameters, columnsResult, 8);
|
||||||
sql = AppendSelect<T10>(sql, parameters, columnsResult, 9);
|
sql = AppendSelect<T10>(sql, parameters, columnsResult, 9);
|
||||||
sql = AppendSelect<T11>(sql, parameters, columnsResult, 10);
|
sql = AppendSelect<T11>(sql, parameters, columnsResult, 10);
|
||||||
|
if (sql.Trim().First() == ',')
|
||||||
|
{
|
||||||
|
sql = sql.TrimStart(' ').TrimStart(',');
|
||||||
|
}
|
||||||
return this.Select<TResult>(sql);
|
return this.Select<TResult>(sql);
|
||||||
}
|
}
|
||||||
public ISugarQueryable<TResult> Select<TResult>(Expression<Func<T, T2, TResult>> expression)
|
public ISugarQueryable<TResult> Select<TResult>(Expression<Func<T, T2, TResult>> expression)
|
||||||
@@ -914,6 +918,10 @@ namespace SqlSugar
|
|||||||
sql = AppendSelect<T10>(sql, parameters, columnsResult, 9);
|
sql = AppendSelect<T10>(sql, parameters, columnsResult, 9);
|
||||||
sql = AppendSelect <T11>(sql, parameters, columnsResult, 10);
|
sql = AppendSelect <T11>(sql, parameters, columnsResult, 10);
|
||||||
sql = AppendSelect<T12>(sql, parameters, columnsResult, 11);
|
sql = AppendSelect<T12>(sql, parameters, columnsResult, 11);
|
||||||
|
if (sql.Trim().First() == ',')
|
||||||
|
{
|
||||||
|
sql = sql.TrimStart(' ').TrimStart(',');
|
||||||
|
}
|
||||||
return this.Select<TResult>(sql);
|
return this.Select<TResult>(sql);
|
||||||
}
|
}
|
||||||
public ISugarQueryable<TResult> Select<TResult>(Expression<Func<T, T2, TResult>> expression)
|
public ISugarQueryable<TResult> Select<TResult>(Expression<Func<T, T2, TResult>> expression)
|
||||||
|
@@ -153,11 +153,11 @@ namespace SqlSugar
|
|||||||
}
|
}
|
||||||
public void InitMappingInfo(Type type)
|
public void InitMappingInfo(Type type)
|
||||||
{
|
{
|
||||||
string cacheKey = "Context.InitAttributeMappingTables" + type.FullName;
|
string cacheKey = "Context.InitAttributeMappingTables" + type.FullName+this.Context?.CurrentConnectionConfig?.ConfigId;
|
||||||
var entityInfo = this.Context.Utilities.GetReflectionInoCacheInstance().GetOrCreate<EntityInfo>(cacheKey,
|
var entityInfo = this.Context.Utilities.GetReflectionInoCacheInstance().GetOrCreate<EntityInfo>(cacheKey,
|
||||||
() =>
|
() =>
|
||||||
{
|
{
|
||||||
var result = this.Context.EntityMaintenance.GetEntityInfo(type);
|
var result = this.Context.EntityMaintenance.GetEntityInfoWithAttr(type);
|
||||||
return result;
|
return result;
|
||||||
});
|
});
|
||||||
//var copyObj = CopyEntityInfo(entityInfo);
|
//var copyObj = CopyEntityInfo(entityInfo);
|
||||||
|
@@ -2,7 +2,7 @@
|
|||||||
<package >
|
<package >
|
||||||
<metadata>
|
<metadata>
|
||||||
<id>SqlSugarCore</id>
|
<id>SqlSugarCore</id>
|
||||||
<version>5.1.4.86</version>
|
<version>5.1.4.87-preview06</version>
|
||||||
<authors>sunkaixuan</authors>
|
<authors>sunkaixuan</authors>
|
||||||
<owners>果糖大数据科技</owners>
|
<owners>果糖大数据科技</owners>
|
||||||
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>
|
<licenseUrl>http://www.apache.org/licenses/LICENSE-2.0.html</licenseUrl>
|
||||||
|
Reference in New Issue
Block a user