Update Sqlfunc SelectAll

This commit is contained in:
sunkaixuna
2021-11-23 22:33:49 +08:00
parent 5c33b4dc5a
commit 6d41efa670
3 changed files with 21 additions and 2 deletions

View File

@@ -543,6 +543,10 @@ namespace SqlSugar
{ {
return "*"; return "*";
} }
if (result.Contains("/**/*"))
{
return result.Replace("/**/*", "");
}
if (result.Contains(".*") && this.IsSingle()) if (result.Contains(".*") && this.IsSingle())
{ {
return "*"; return "*";

View File

@@ -23,5 +23,9 @@ namespace SqlSugar
{ {
throw new NotSupportedException("Can only be used in expressions"); throw new NotSupportedException("Can only be used in expressions");
} }
public static FieldType SelectAll<FieldType>(this FieldType field,string singleTableQueryShortName)
{
throw new NotSupportedException("Can only be used in expressions");
}
} }
} }

View File

@@ -322,7 +322,13 @@ namespace SqlSugar
if (name.IsIn("GetSelfAndAutoFill","SelectAll")) if (name.IsIn("GetSelfAndAutoFill","SelectAll"))
{ {
var memberValue = (args.First() as MemberExpression).Expression.ToString(); var memberValue = (args.First() as MemberExpression).Expression.ToString();
model.Args.Add(new MethodCallExpressionArgs() { MemberValue = memberValue, IsMember = true, MemberName = memberValue }); var data = new MethodCallExpressionArgs() { MemberValue = memberValue, IsMember = true, MemberName = memberValue };
model.Args.Add(data);
if (args.Count() == 2)
{
data.MemberName = (args.Last()).ToString();
data.MemberValue = "." ;
}
} }
else else
{ {
@@ -773,7 +779,12 @@ namespace SqlSugar
case "SelectAll": case "SelectAll":
case "GetSelfAndAutoFill": case "GetSelfAndAutoFill":
this.Context.Parameters.RemoveAll(it => it.ParameterName == model.Args[0].MemberName.ObjToString()); this.Context.Parameters.RemoveAll(it => it.ParameterName == model.Args[0].MemberName.ObjToString());
return this.Context.DbMehtods.GetSelfAndAutoFill(model.Args[0].MemberValue.ObjToString(), this.Context.IsSingle); var result1= this.Context.DbMehtods.GetSelfAndAutoFill(model.Args[0].MemberValue.ObjToString(), this.Context.IsSingle);
if ((model.Args[0].MemberValue+"") == "."&&this.Context.IsSingle)
{
result1 =this.Context.GetTranslationTableName(model.Args[0].MemberName+"",false)+".*/**/" + result1;
}
return result1;
case "GetDate": case "GetDate":
return this.Context.DbMehtods.GetDate(); return this.Context.DbMehtods.GetDate();
case "GetRandom": case "GetRandom":