lsm/SqlSugar
1
0
Fork 0
mirror of https://gitee.com/dotnetchina/SqlSugar.git synced 2025-11-07 18:04:55 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Update .net core project

Browse Source
This commit is contained in:
sunkaixuan
2022-07-27 13:26:04 +08:00
parent 96c18709e3
commit a2b77ca7a2
3 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs
View File

@@ -351,6 +351,10 @@ namespace SqlSugar
{
this.Context.Parameters.AddRange(newContext.Parameters);
}
if (this.Context.SingleTableNameSubqueryShortName == "Subqueryable()")
{
this.Context.SingleTableNameSubqueryShortName = newContext.SingleTableNameSubqueryShortName;
}
return newContext.Result.GetResultString();
}
public string GetNewExpressionValue(Expression item,ResolveExpressType type)

4
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/Subquery/Items/SubTop.cs
View File

@@ -35,7 +35,7 @@ namespace SqlSugar
{
get
{
if (this.Context is SqlServerExpressionContext)
if (this.Context is SqlServerExpressionContext || this.Context.GetType().Name.Contains("Access"))
{
return 150;
}
@@ -53,7 +53,7 @@ namespace SqlSugar
public string GetValue(Expression expression)
{
if (this.Context is SqlServerExpressionContext)
if (this.Context is SqlServerExpressionContext|| this.Context.GetType().Name.Contains("Access"))
{
return "TOP 1";
}

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

@@ -403,7 +403,7 @@ namespace SqlSugar
private static Restult GetCacheInstance<Restult>(string className, Type[] types)
{
var cacheKey = className + string.Join(",", types.Select(it => it.FullName));
Type type;
Type type=null;
if (typeCache.ContainsKey(cacheKey))
{
type = typeCache[cacheKey];
@@ -418,7 +418,11 @@ namespace SqlSugar
}
else
{
type = GetCustomTypeByClass(className + "`" + types.Length).MakeGenericType(types);
var custom = GetCustomTypeByClass(className + "`" + types.Length);
if (custom != null)
{
type = custom.MakeGenericType(types);
}
if (type == null)
{
type = Type.GetType(className + "`" + types.Length, true).MakeGenericType(types);
@@ -444,7 +448,11 @@ namespace SqlSugar
}
else
{
type = GetCustomTypeByClass(className + "`" + types.Length).MakeGenericType(types);
var custom = GetCustomTypeByClass(className + "`" + types.Length);
if (custom != null)
{
type = custom.MakeGenericType(types);
}
if (type == null)
{
type = Type.GetType(className + "`" + types.Length, true).MakeGenericType(types);