GitHub
/
SqlSugar
6
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

Update json 2 sql

SqlSugar5
sunkaixuan 2 years ago
parent
c33cd5d19f
commit
37e7bb8aa6
3 changed files with 37 additions and 11 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 36
      Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
  2. 10
      Src/Asp.Net/SqlSugar/Interface/IQueryable.cs
  3. 2
      Src/Asp.Net/SqlSugar/Json2Sql/ModelToSql/SqlPart.cs

36
Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
View File

@ -645,7 +645,11 @@ namespace SqlSugar
this.Where<T>(whereString, whereObj);
return this;
}
public virtual ISugarQueryable<T> Where(IFuncModel funcModel)
{
var obj= this.SqlBuilder.FuncModelToSql(funcModel);
return this.Where(obj.Key, obj.Value);
}
public virtual ISugarQueryable<T> Where(List<IConditionalModel> conditionalModels)
{
if (conditionalModels.IsNullOrEmpty()) return this;
@ -3626,7 +3630,11 @@ namespace SqlSugar
base.Where(conditionalModels);
return this;
}
public new ISugarQueryable<T,T2> Where(IFuncModel funcModel)
{
var obj = this.SqlBuilder.FuncModelToSql(funcModel);
return this.Where(obj.Key, obj.Value);
}
public new ISugarQueryable<T, T2> WhereIF(bool isWhere, string whereString, object whereObj)
{
if (!isWhere) return this;
@ -4233,7 +4241,11 @@ namespace SqlSugar
base.Where(conditionalModels);
return this;
}
public new ISugarQueryable<T, T2,T3> Where(IFuncModel funcModel)
{
var obj = this.SqlBuilder.FuncModelToSql(funcModel);
return this.Where(obj.Key, obj.Value);
}
public ISugarQueryable<T, T2, T3> WhereIF(bool isWhere, Expression<Func<T, T2, T3, bool>> expression)
{
if (isWhere)
@ -4619,7 +4631,11 @@ namespace SqlSugar
base.Where(conditionalModels);
return this;
}
public new ISugarQueryable<T, T2,T3,T4> Where(IFuncModel funcModel)
{
var obj = this.SqlBuilder.FuncModelToSql(funcModel);
return this.Where(obj.Key, obj.Value);
}
public new ISugarQueryable<T, T2, T3, T4> WhereIF(bool isWhere, Expression<Func<T, bool>> expression)
{
if (isWhere)
@ -5229,7 +5245,11 @@ namespace SqlSugar
base.Where(conditionalModels);
return this;
}
public new ISugarQueryable<T, T2, T3, T4,T5> Where(IFuncModel funcModel)
{
var obj = this.SqlBuilder.FuncModelToSql(funcModel);
return this.Where(obj.Key, obj.Value);
}
public new ISugarQueryable<T, T2, T3, T4, T5> WhereIF(bool isWhere, Expression<Func<T, bool>> expression)
{
if (isWhere)
@ -5778,7 +5798,11 @@ namespace SqlSugar
base.Where(conditionalModels);
return this;
}
public new ISugarQueryable<T, T2, T3, T4, T5,T6> Where(IFuncModel funcModel)
{
var obj = this.SqlBuilder.FuncModelToSql(funcModel);
return this.Where(obj.Key, obj.Value);
}
public new ISugarQueryable<T, T2, T3, T4, T5, T6> WhereIF(bool isWhere, Expression<Func<T, bool>> expression)
{
if (isWhere)

10
Src/Asp.Net/SqlSugar/Interface/IQueryable.cs
View File

@ -61,6 +61,7 @@ namespace SqlSugar
ISugarQueryable<T> TranLock(DbLockType? LockType = DbLockType.Wait);
ISugarQueryable<T> Where(Expression<Func<T, bool>> expression);
ISugarQueryable<T> Where(string whereString, object parameters = null);
ISugarQueryable<T> Where(IFuncModel funcModel);
ISugarQueryable<T> Where(List<IConditionalModel> conditionalModels);
ISugarQueryable<T> Where(List<IConditionalModel> conditionalModels,bool isWrap);
ISugarQueryable<T> Where(string fieldName, string conditionalType, object fieldValue);
@ -220,6 +221,7 @@ namespace SqlSugar
new ISugarQueryable<T, T2> Where(Expression<Func<T, bool>> expression);
ISugarQueryable<T, T2> Where(Expression<Func<T, T2, bool>> expression);
new ISugarQueryable<T, T2> Where(List<IConditionalModel> conditionalModels);
new ISugarQueryable<T,T2> Where(IFuncModel funcModel);
new ISugarQueryable<T, T2> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
ISugarQueryable<T, T2> WhereIF(bool isWhere, Expression<Func<T, T2, bool>> expression);
@ -319,7 +321,7 @@ namespace SqlSugar
ISugarQueryable<T, T2, T3> Where(Expression<Func<T, T2, bool>> expression);
ISugarQueryable<T, T2, T3> Where(Expression<Func<T, T2, T3, bool>> expression);
new ISugarQueryable<T, T2, T3> Where(List<IConditionalModel> conditionalModels);
new ISugarQueryable<T, T2,T3> Where(IFuncModel funcModel);
new ISugarQueryable<T, T2, T3> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
ISugarQueryable<T, T2, T3> WhereIF(bool isWhere, Expression<Func<T, T2, bool>> expression);
ISugarQueryable<T, T2, T3> WhereIF(bool isWhere, Expression<Func<T, T2, T3, bool>> expression);
@ -434,7 +436,7 @@ namespace SqlSugar
ISugarQueryable<T, T2, T3, T4> Where(Expression<Func<T, T2, T3, bool>> expression);
ISugarQueryable<T, T2, T3, T4> Where(Expression<Func<T, T2, T3, T4, bool>> expression);
new ISugarQueryable<T, T2, T3, T4> Where(List<IConditionalModel> conditionalModels);
new ISugarQueryable<T, T2, T3,T4> Where(IFuncModel funcModel);
new ISugarQueryable<T, T2, T3, T4> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
ISugarQueryable<T, T2, T3, T4> WhereIF(bool isWhere, Expression<Func<T, T2, bool>> expression);
ISugarQueryable<T, T2, T3, T4> WhereIF(bool isWhere, Expression<Func<T, T2, T3, bool>> expression);
@ -560,7 +562,7 @@ namespace SqlSugar
ISugarQueryable<T, T2, T3, T4, T5> Where(Expression<Func<T, T2, T3, T4, T5, bool>> expression);
new ISugarQueryable<T, T2, T3, T4, T5> Where(List<IConditionalModel> conditionalModels);
new ISugarQueryable<T, T2, T3, T4,T5> Where(IFuncModel funcModel);
new ISugarQueryable<T, T2, T3, T4, T5> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
ISugarQueryable<T, T2, T3, T4, T5> WhereIF(bool isWhere, Expression<Func<T, T2, bool>> expression);
ISugarQueryable<T, T2, T3, T4, T5> WhereIF(bool isWhere, Expression<Func<T, T2, T3, bool>> expression);
@ -678,7 +680,7 @@ namespace SqlSugar
ISugarQueryable<T, T2, T3, T4, T5, T6> Where(Expression<Func<T, T2, T3, T4, T5, bool>> expression);
ISugarQueryable<T, T2, T3, T4, T5, T6> Where(Expression<Func<T, T2, T3, T4, T5, T6, bool>> expression);
new ISugarQueryable<T, T2, T3, T4, T5, T6> Where(List<IConditionalModel> conditionalModels);
new ISugarQueryable<T, T2, T3, T4, T5,T6> Where(IFuncModel funcModel);
new ISugarQueryable<T, T2, T3, T4, T5, T6> WhereIF(bool isWhere, Expression<Func<T, bool>> expression);
ISugarQueryable<T, T2, T3, T4, T5, T6> WhereIF(bool isWhere, Expression<Func<T, T2, bool>> expression);
ISugarQueryable<T, T2, T3, T4, T5, T6> WhereIF(bool isWhere, Expression<Func<T, T2, T3, bool>> expression);

2
Src/Asp.Net/SqlSugar/Json2Sql/ModelToSql/SqlPart.cs
View File

@ -8,7 +8,7 @@ namespace SqlSugar
public abstract partial class SqlBuilderProvider : SqlBuilderAccessory, ISqlBuilder
{
#region Variable
private string[] SqlSplicingOperator = new string[] { ">", ">=", "<", "<=", "(", ")", "=", "||", "&&","&","|" };
private string[] SqlSplicingOperator = new string[] { ">", ">=", "<", "<=", "(", ")", "=", "||", "&&","&","|","null","is","isnot" };
#endregion
#region Root

Write Preview
Loading…
Cancel
Save