From 5c4ec2e54a7b293dabc1e8ba25e2f699cf41b206 Mon Sep 17 00:00:00 2001 From: sunkaixuan <610262374@qq.com> Date: Wed, 12 Jul 2017 01:33:22 +0800 Subject: [PATCH] Update Core --- .../SqliteTest/DataBase/SqlSugar4xTest.sqlite | Bin 110592 -> 118784 bytes .../IDataReaderEntityBuilder.cs | 8 +- .../DbFirstProvider/DbFirstProvider.cs | 1 + .../QueryableProvider/QueryableProvider.cs | 163 +++++++++--------- .../Method/DefaultDbMethod.cs | 5 + .../ExpressionsToSql/Method/IDbMethods.cs | 1 + .../ResolveItems/BaseResolve.cs | 14 ++ .../MemberInitExpressionResolve.cs | 11 +- .../MethodCallExpressionResolve.cs | 11 +- .../src/SqlSugar/Properties/AssemblyInfo.cs | 4 +- .../src/SqlSugar/SqlSugarClient.cs | 24 ++- .../src/SqlSugar/SqlSugarForCore.nuspec | 2 +- 12 files changed, 150 insertions(+), 94 deletions(-) diff --git a/Src/Asp.Net/SqliteTest/DataBase/SqlSugar4xTest.sqlite b/Src/Asp.Net/SqliteTest/DataBase/SqlSugar4xTest.sqlite index f8d79913938860fbbe4692e5f2b68bcdb0ee2faa..81c2453d8a76d22e3f1ebafaca294108caa331a3 100644 GIT binary patch literal 118784 zcmeI53y@T2dY)(cexDH%8X=I>jD!G5pg!kxpFWMG6&E2fD=wp9kc707n1K;Of&mSK zgjQOq&!3*2t;E@)u-A5+#6{utmUG*}*iM{FB`n?~-XzXqTyZW{*~P@UI4Q3&l|-`z zsPnzu|LN~*podkJTq&u3m00xj>1Lk(dN|MdPoJLM{@mt$(-ZmE4^ABzo6b8u{XM*?_~y%ryM z?6F?8e0pqr|HOuadnQKlA9lei7s?j>W_yKFmz(d{FtTyo=*Il$y7ikk=DXZ!MJk^k z+LIsJI{FCx*VeHE6Zz4NFE(N5@V2+w@XV2Yd)n~S#O{3u#`fp8?%0AyJvBBxF}jZ) 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 J?!Q;4{6C7Xhot}j literal 110592 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 Lnn?N|)LQ==3cE|_ diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbBindProvider/IDataReaderEntityBuilder.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbBindProvider/IDataReaderEntityBuilder.cs index 6a3ba335e..ce80a3768 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbBindProvider/IDataReaderEntityBuilder.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbBindProvider/IDataReaderEntityBuilder.cs @@ -52,7 +52,7 @@ namespace SqlSugar private static readonly MethodInfo getConvertGuid = typeof(IDataRecordExtensions).GetMethod("GetConvertGuid"); private static readonly MethodInfo getConvertInt16 = typeof(IDataRecordExtensions).GetMethod("GetConvertInt16"); private static readonly MethodInfo getConvertInt32 = typeof(IDataRecordExtensions).GetMethod("GetConvertInt32"); - private static readonly MethodInfo getConvetInt64 = typeof(IDataRecordExtensions).GetMethod("GetConvetInt64"); + private static readonly MethodInfo getConvertInt64 = typeof(IDataRecordExtensions).GetMethod("GetConvetInt64"); private static readonly MethodInfo getConvertEnum_Null = typeof(IDataRecordExtensions).GetMethod("GetConvertEnum_Null"); private static readonly MethodInfo getOtherNull = typeof(IDataRecordExtensions).GetMethod("GetOtherNull"); private static readonly MethodInfo getOther = typeof(IDataRecordExtensions).GetMethod("GetOther"); @@ -218,8 +218,10 @@ namespace SqlSugar { case CSharpDataType.@int: CheckType(bind.IntThrow, bindProperyTypeName, validPropertyName, propertyName); - if (bindProperyTypeName.IsContainsIn("int", "int32", "int64")) + if (bindProperyTypeName.IsContainsIn("int", "int32")) method = isNullableType ? getConvertInt32 : getInt32; + if (bindProperyTypeName.IsContainsIn("int64")) + method = isNullableType ? getConvertInt64 : getInt64; break; case CSharpDataType.@bool: if (bindProperyTypeName == "bool" || bindProperyTypeName == "boolean") @@ -267,7 +269,7 @@ namespace SqlSugar break; case CSharpDataType.@long: if (bindProperyTypeName == "int64" || bindProperyTypeName == "long") - method = isNullableType ? getConvetInt64 : getInt64; + method = isNullableType ? getConvertInt64 : getInt64; break; default: method = getValueMethod; diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbFirstProvider/DbFirstProvider.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbFirstProvider/DbFirstProvider.cs index d6d25ca95..bb2eec79d 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbFirstProvider/DbFirstProvider.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/DbFirstProvider/DbFirstProvider.cs @@ -227,6 +227,7 @@ namespace SqlSugar result = "DateTime.Now"; } result = result.Replace("\r", "\t").Replace("\n", "\t"); + result = result.IsIn("''","\"\"") ? string.Empty : result; return result; } private string GetPropertyText(DbColumnInfo item, string PropertyText) diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs index 2b1cf0c6a..d735963f5 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs @@ -117,7 +117,8 @@ namespace SqlSugar } public virtual ISugarQueryable Where(string whereString, object whereObj = null) { - this.Where(whereString, whereObj); + if (whereString.IsValuable()) + this.Where(whereString, whereObj); return this; } public virtual ISugarQueryable Where(string whereString, object whereObj = null) @@ -793,7 +794,7 @@ namespace SqlSugar #region Order public ISugarQueryable OrderBy(Expression> expression, OrderByType type = OrderByType.Asc) { - _OrderBy(expression,type); + _OrderBy(expression, type); return this; } @@ -876,19 +877,19 @@ namespace SqlSugar #endregion #region Aggr - public TResult Max(Expression> expression) - { - return _Max(expression); - } - public TResult Min(Expression> expression) - { - return _Min(expression); - } - public TResult Sum(Expression> expression) - { - return _Sum(expression); - } - public TResult Avg(Expression> expression) + public TResult Max(Expression> expression) + { + return _Max(expression); + } + public TResult Min(Expression> expression) + { + return _Min(expression); + } + public TResult Sum(Expression> expression) + { + return _Sum(expression); + } + public TResult Avg(Expression> expression) { return _Avg(expression); } @@ -1024,19 +1025,19 @@ namespace SqlSugar #endregion #region Aggr - public TResult Max(Expression> expression) - { - return _Max(expression); - } - public TResult Min(Expression> expression) - { - return _Min(expression); - } - public TResult Sum(Expression> expression) - { - return _Sum(expression); - } - public TResult Avg(Expression> expression) + public TResult Max(Expression> expression) + { + return _Max(expression); + } + public TResult Min(Expression> expression) + { + return _Min(expression); + } + public TResult Sum(Expression> expression) + { + return _Sum(expression); + } + public TResult Avg(Expression> expression) { return _Avg(expression); } @@ -1198,19 +1199,19 @@ namespace SqlSugar #endregion #region Aggr - public TResult Max(Expression> expression) - { - return _Max(expression); - } - public TResult Min(Expression> expression) - { - return _Min(expression); - } - public TResult Sum(Expression> expression) - { - return _Sum(expression); - } - public TResult Avg(Expression> expression) + public TResult Max(Expression> expression) + { + return _Max(expression); + } + public TResult Min(Expression> expression) + { + return _Min(expression); + } + public TResult Sum(Expression> expression) + { + return _Sum(expression); + } + public TResult Avg(Expression> expression) { return _Avg(expression); } @@ -1398,20 +1399,20 @@ namespace SqlSugar #endregion #region Aggr - public TResult Max(Expression> expression) - { - return _Max(expression); - } - public TResult Min(Expression> expression) - { - return _Min(expression); - } - public TResult Sum(Expression> expression) - { - return _Sum(expression); - } - public TResult Avg(Expression> expression) - { + public TResult Max(Expression> expression) + { + return _Max(expression); + } + public TResult Min(Expression> expression) + { + return _Min(expression); + } + public TResult Sum(Expression> expression) + { + return _Sum(expression); + } + public TResult Avg(Expression> expression) + { return _Avg(expression); } #endregion @@ -1625,19 +1626,19 @@ namespace SqlSugar #endregion #region Aggr - public TResult Max(Expression> expression) - { - return _Max(expression); - } - public TResult Min(Expression> expression) - { - return _Min(expression); - } - public TResult Sum(Expression> expression) - { - return _Sum(expression); - } - public TResult Avg(Expression> expression) + public TResult Max(Expression> expression) + { + return _Max(expression); + } + public TResult Min(Expression> expression) + { + return _Min(expression); + } + public TResult Sum(Expression> expression) + { + return _Sum(expression); + } + public TResult Avg(Expression> expression) { return _Avg(expression); } @@ -1878,19 +1879,19 @@ namespace SqlSugar #endregion #region Aggr - public TResult Max(Expression> expression) - { - return _Max(expression); - } - public TResult Min(Expression> expression) - { - return _Min(expression); - } - public TResult Sum(Expression> expression) - { - return _Sum(expression); - } - public TResult Avg(Expression> expression) + public TResult Max(Expression> expression) + { + return _Max(expression); + } + public TResult Min(Expression> expression) + { + return _Min(expression); + } + public TResult Sum(Expression> expression) + { + return _Sum(expression); + } + public TResult Avg(Expression> expression) { return _Avg(expression); } diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Method/DefaultDbMethod.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Method/DefaultDbMethod.cs index a2e12a61d..4f63df451 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Method/DefaultDbMethod.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Method/DefaultDbMethod.cs @@ -270,5 +270,10 @@ namespace SqlSugar { return "( 1 = 2 ) "; } + + public string GuidNew() + { + return "'"+Guid.NewGuid()+"' "; + } } } diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Method/IDbMethods.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Method/IDbMethods.cs index c91dc1a0e..0e6cca3ce 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Method/IDbMethods.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/Method/IDbMethods.cs @@ -49,5 +49,6 @@ namespace SqlSugar string MappingColumn(MethodCallExpressionModel model); string True(); string False(); + string GuidNew(); } } diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs index bab23d6a2..b61526a3c 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs @@ -235,6 +235,20 @@ namespace SqlSugar }; return methodCallExpressionArgs; } + + protected string GetNewExpressionValue(Expression item) + { + var newContext = this.Context.GetCopyContext(); + newContext.Resolve(item, this.Context.IsJoin ? ResolveExpressType.WhereMultiple : ResolveExpressType.WhereSingle); + this.Context.Index = newContext.Index; + this.Context.ParameterIndex = newContext.ParameterIndex; + if (newContext.Parameters.IsValuable()) + { + this.Context.Parameters.AddRange(newContext.Parameters); + } + return newContext.Result.GetResultString(); + } + protected void ResolveNewExpressions(ExpressionParameter parameter, Expression item, string asName) { if (item.NodeType == ExpressionType.Constant) diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/MemberInitExpressionResolve.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/MemberInitExpressionResolve.cs index 4157d32f7..0e0811bd9 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/MemberInitExpressionResolve.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/MemberInitExpressionResolve.cs @@ -49,7 +49,13 @@ namespace SqlSugar MemberAssignment memberAssignment = (MemberAssignment)binding; var memberName = memberAssignment.Member.Name; var item = memberAssignment.Expression; - if (item is UnaryExpression||item.NodeType == ExpressionType.Constant || (item is MemberExpression) && ((MemberExpression)item).Expression.NodeType == ExpressionType.Constant) + if ((item is MemberExpression) && ((MemberExpression)item).Expression == null) + { + var paramterValue = ExpressionTool.DynamicInvoke(item); + string parameterName = AppendParameter(paramterValue); + this.Context.Result.Append(base.Context.GetEqString(memberName, parameterName)); + } + else if (item is UnaryExpression || item.NodeType == ExpressionType.Constant || (item is MemberExpression) && ((MemberExpression)item).Expression.NodeType == ExpressionType.Constant) { base.Expression = item; base.Start(); @@ -80,7 +86,8 @@ namespace SqlSugar } else if (item is BinaryExpression) { - Check.ThrowNotSupportedException(item.GetType().Name); + var result=GetNewExpressionValue(item); + this.Context.Result.Append(base.Context.GetEqString(memberName, result)); } } } diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs index 50f91dbf6..e77659b19 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/MethodCallExpressionResolve.cs @@ -14,13 +14,18 @@ namespace SqlSugar var express = base.Expression as MethodCallExpression; var isLeft = parameter.IsLeft; string methodName = express.Method.Name; - if (methodName == "get_Item") { - string paramterName =this.Context.SqlParameterKeyWord+ExpressionConst.Const + this.Context.ParameterIndex; + if (methodName == "get_Item") + { + string paramterName = this.Context.SqlParameterKeyWord + ExpressionConst.Const + this.Context.ParameterIndex; this.Context.Parameters.Add(new SugarParameter(paramterName, ExpressionTool.DynamicInvoke(express))); - this.Context.Result.Append(string.Format(" {0} ",paramterName)); + this.Context.Result.Append(string.Format(" {0} ", paramterName)); this.Context.ParameterIndex++; return; } + else if (methodName == "NewGuid") { + this.Context.Result.Append(this.Context.DbMehtods.GuidNew()); + return; + } var isValidNativeMethod = MethodMapping.ContainsKey(methodName)&&express.Method.DeclaringType.Namespace==("System"); if (!isValidNativeMethod&&express.Method.DeclaringType.Namespace.IsIn("System.Linq", "System.Collections.Generic")&&methodName=="Contains") { methodName = "ContainsArray"; diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Properties/AssemblyInfo.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Properties/AssemblyInfo.cs index 919d70691..c23612b83 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Properties/AssemblyInfo.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Properties/AssemblyInfo.cs @@ -17,5 +17,5 @@ using System.Runtime.InteropServices; // The following GUID is for the ID of the typelib if this project is exposed to COM [assembly: Guid("1c022a5c-4e4d-4026-a8a3-f659b9740a1a")] -[assembly: AssemblyVersion("4.2.0.3")] -[assembly: AssemblyFileVersion("4.2.0.3")] +[assembly: AssemblyVersion("4.2.0.4")] +[assembly: AssemblyFileVersion("4.2.0.4")] diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarClient.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarClient.cs index 8a0643283..a58579e07 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarClient.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarClient.cs @@ -224,6 +224,25 @@ namespace SqlSugar queryable.Where(joinExpression); return queryable; } + public virtual List UnionAll(params ISugarQueryable[] queryables) where T : class, new() + { + if (queryables.IsNullOrEmpty()) return new List(); + List result = new List(); + foreach (var item in queryables) + { + var addItems = item.ToList(); + if (addItems.IsValuable()) + { + result.AddRange(addItems); + } + } + return result; + } + public virtual List UnionAll(List> queryables) where T : class, new() + { + if (queryables.IsNullOrEmpty()) return new List(); + return UnionAll(queryables.ToArray()); + } #endregion #region Insertable @@ -259,7 +278,7 @@ namespace SqlSugar { return this.Deleteable().In(primaryKeyValue); } - public virtual IDeleteable Deleteable(dynamic [] primaryKeyValues) where T : class, new() + public virtual IDeleteable Deleteable(dynamic[] primaryKeyValues) where T : class, new() { return this.Deleteable().In(primaryKeyValues); } @@ -383,7 +402,8 @@ namespace SqlSugar { get { - if (_SimpleClient == null) { + if (_SimpleClient == null) + { _SimpleClient = new SimpleClient(this); } return _SimpleClient; diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec index de8674912..f2afd2ffd 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec @@ -2,7 +2,7 @@ sqlSugarCore - 4.2.0.3 + 4.2.0.4 sunkaixuan Landa http://www.apache.org/licenses/LICENSE-2.0.html