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

Update .net core

Browse Source
This commit is contained in:
sunkaixuan 2022-11-04 00:52:38 +08:00
parent 032df6c145
commit 6852578e73
5 changed files with 52 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Src/Asp.NetCore2/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs
View File

@ -129,7 +129,17 @@ namespace SqlSugar
if (model is ConditionalModel)
{
var item = model as ConditionalModel;
if (item.FieldName == $"[value=sql{UtilConstants.ReplaceKey}]")
if (item.CustomConditionalFunc != null)
{
var colIndex = mainIndex + beginIndex;
var colType = colIndex == 0 ? "" : "AND";
var custom = item.CustomConditionalFunc.GetConditionalSql(item, colIndex);
parameters.AddRange(custom.Value);
builder.AppendFormat(" "+colType + " "+custom.Key);
mainIndex++;
continue;
}
else if (item.FieldName == $"[value=sql{UtilConstants.ReplaceKey}]")
{
builder.Append(item.FieldValue);
continue;

8
Src/Asp.NetCore2/SqlSugar/Entities/ConditionalModel.cs
View File

@ -25,6 +25,14 @@ namespace SqlSugar
public string FieldName { get; set; }
public string FieldValue { get; set; }
public string CSharpTypeName { get; set; }
public ICustomConditionalFunc CustomConditionalFunc { get; set; }
public string CustomP1 { get; set; }
public string CustomP2 { get; set; }
public string CustomP3 { get; set; }
public string CustomP4 { get; set; }
public ConditionalType ConditionalType { get; set; }
[Newtonsoft.Json.JsonIgnoreAttribute]
public Func<string,object> FieldValueConvertFunc { get; set; }

13
Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/Subquery/Items/SubSelect.cs
View File

@ -45,10 +45,11 @@ namespace SqlSugar
var exp = expression as MethodCallExpression;
InitType(exp);
var result = "";
if (this.Context.JoinIndex == 0)
result = SubTools.GetMethodValue(this.Context, exp.Arguments[0], ResolveExpressType.FieldSingle);
else
result = SubTools.GetMethodValue(this.Context, exp.Arguments[0], ResolveExpressType.FieldMultiple);
var oldIsSingle = this.Context.IsSingle;
this.Context.IsSingle = false;
result = SubTools.GetMethodValue(this.Context, exp.Arguments[0], ResolveExpressType.FieldMultiple);
this.Context.IsSingle = oldIsSingle;
SetShortName(exp, result);
@ -69,7 +70,7 @@ namespace SqlSugar
public void SetShortName(MethodCallExpression exp, string result)
{
if (exp.Arguments[0] is LambdaExpression && result.IsContainsIn("+", "-","*","/"))
if (exp.Arguments[0] is LambdaExpression)
{
var parameters = (exp.Arguments[0] as LambdaExpression).Parameters;
if (parameters != null && parameters.Count > 0)
@ -81,7 +82,7 @@ namespace SqlSugar
}
public void SetShortNameNext(MethodCallExpression exp, string result)
{
if (exp.Arguments.Count>1&&exp.Arguments[1] is LambdaExpression && result.IsContainsIn("+", "-", "*", "/"))
if (exp.Arguments.Count>1&&exp.Arguments[1] is LambdaExpression )
{
var parameters = (exp.Arguments[1] as LambdaExpression).Parameters;
if (parameters != null && parameters.Count > 0)

13
Src/Asp.NetCore2/SqlSugar/Interface/ICustomConditionalFunc.cs Normal file
View File

@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace SqlSugar
{
public interface ICustomConditionalFunc
{
KeyValuePair<string, SugarParameter[]> GetConditionalSql(ConditionalModel json,int index);
}
}

13
Src/Asp.NetCore2/SqlSugar/Utilities/DbExtensions.cs
View File

@ -52,7 +52,9 @@ namespace SqlSugar
{
if (!value.IsNullOrEmpty())
{
var oldLength=value.Length;
value = value.Replace("'", "''");
if (oldLength!=value.Length&& value.IndexOf(")")>0&&value.IndexOf(@"\''")>0) value=value.Replace("\\","\\\\");
}
return value;
}
@ -77,6 +79,17 @@ namespace SqlSugar
}
return value;
}
public static string ToCheckRegexW(this string value)
{
if (Regex.IsMatch(value,@"^\w+$"))
{
return value;
}
else
{
throw new Exception($"ToCheckRegexW {value} format error ");
}
}
internal static string ToLower(this string value ,bool isAutoToLower)
{
if (value == null) return null;