lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-05-16 21:19:34 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Synchronization code

Browse Source
This commit is contained in:
sunkaixuan 2024-01-23 05:26:46 +08:00
parent 60c2db24c8
commit 0f8e88189e
2 changed files with 29 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Src/Asp.NetCore2/SqlSugar/Abstract/QueryableProvider/NavigatManager.cs
View File

@ -248,7 +248,7 @@ namespace SqlSugar
if (sql.SelectString == null)
{
var columns = bEntityInfo.Columns.Where(it => !it.IsIgnore)
.Select(it => GetOneToManySelectByColumnInfo(it)).ToList();
.Select(it => GetOneToManySelectByColumnInfo(it,abDb)).ToList();
sql.SelectString = String.Join(",", columns);
}
var bList = selector(bDb.Queryable<object>().AS(bEntityInfo.DbTableName).ClearFilter(QueryBuilder.RemoveFilters).Filter(this.QueryBuilder?.IsDisabledGobalFilter == true ? null : bEntityInfo.Type).AddParameters(sql.Parameters).Where(conditionalModels2).WhereIF(sql.WhereString.HasValue(),sql.WhereString).Select(sql.SelectString).OrderByIF(sql.OrderByString.HasValue(),sql.OrderByString));
@ -369,7 +369,7 @@ namespace SqlSugar
if (sqlObj.SelectString == null)
{
var columns = navEntityInfo.Columns.Where(it => !it.IsIgnore)
.Select(it => GetOneToOneSelectByColumnInfo(it)).ToList();
.Select(it => GetOneToOneSelectByColumnInfo(it,db)).ToList();
sqlObj.SelectString = String.Join(",", columns);
}
var navList = selector(db.Queryable<object>().ClearFilter(QueryBuilder.RemoveFilters).Filter((navPkColumn.IsPrimarykey&& navPkCount==1) ? null : this.QueryBuilder?.IsDisabledGobalFilter == true ? null : navEntityInfo.Type).AS(GetDbTableName(navEntityInfo))
@ -447,7 +447,7 @@ namespace SqlSugar
if (sqlObj.SelectString == null)
{
var columns = navEntityInfo.Columns.Where(it => !it.IsIgnore)
.Select(it => GetOneToManySelectByColumnInfo(it)).ToList();
.Select(it => GetOneToManySelectByColumnInfo(it,childDb)).ToList();
sqlObj.SelectString = String.Join(",", columns);
}
var navList = selector(childDb.Queryable<object>(sqlObj.TableShortName).AS(GetDbTableName(navEntityInfo)).ClearFilter(QueryBuilder.RemoveFilters).Filter(this.QueryBuilder?.IsDisabledGobalFilter == true ? null : navEntityInfo.Type).AddParameters(sqlObj.Parameters).Where(conditionalModels).WhereIF(sqlObj.WhereString.HasValue(), sqlObj.WhereString).WhereIF(navObjectNameColumnInfo?.Navigat?.WhereSql!=null, navObjectNameColumnInfo?.Navigat?.WhereSql).Select(sqlObj.SelectString).OrderByIF(sqlObj.OrderByString.HasValue(), sqlObj.OrderByString));
@ -937,21 +937,24 @@ namespace SqlSugar
}
}
private string GetOneToManySelectByColumnInfo(EntityColumnInfo it)
private string GetOneToManySelectByColumnInfo(EntityColumnInfo it,ISqlSugarClient db)
{
QueryBuilder QueryBuilder =InstanceFactory.GetQueryBuilderWithContext(db);
if (it.QuerySql.HasValue())
{
return it.QuerySql + " AS " + QueryBuilder.Builder.GetTranslationColumnName(it.PropertyName);
}
return QueryBuilder.Builder.GetTranslationColumnName(it.DbColumnName) + " AS " + QueryBuilder.Builder.GetTranslationColumnName(it.PropertyName);
}
private string GetOneToOneSelectByColumnInfo(EntityColumnInfo it)
private string GetOneToOneSelectByColumnInfo(EntityColumnInfo it,ISqlSugarClient db)
{
QueryBuilder QueryBuilder = InstanceFactory.GetQueryBuilderWithContext(db);
if (it.QuerySql.HasValue())
{
return it.QuerySql + " AS " + QueryBuilder.Builder.GetTranslationColumnName(it.PropertyName);
}
return QueryBuilder.Builder.GetTranslationColumnName(it.DbColumnName) + " AS " + QueryBuilder.Builder.GetTranslationColumnName(it.PropertyName);
}
}
}

21
Src/Asp.NetCore2/SqlSugar/Infrastructure/InstanceFactory.cs
View File

@ -154,6 +154,27 @@ namespace SqlSugar
#endregion
public static QueryBuilder GetQueryBuilderWithContext(ISqlSugarClient db)
{
if (db is SqlSugarClient)
{
db = (db as SqlSugarClient).Context;
}
else if (db is SqlSugarScope)
{
db = (db as SqlSugarScope).ScopedContext.Context;
}
if (!(db is SqlSugarProvider))
{
db = new SqlSugarClient(db.CurrentConnectionConfig).Context;
}
var QueryBuilder = InstanceFactory.GetQueryBuilder(db.CurrentConnectionConfig);
QueryBuilder.Context = (SqlSugarProvider)db;
QueryBuilder.Builder = InstanceFactory.GetSqlbuilder(db.CurrentConnectionConfig);
QueryBuilder.Builder.Context = (SqlSugarProvider)db;
return QueryBuilder;
}
public static QueryBuilder GetQueryBuilder(ConnectionConfig currentConnectionConfig)
{
if (currentConnectionConfig.DbType == DbType.SqlServer)