Update Core

DotNetNext · Jul 3, 2017 · a63711b · a63711b
1 parent a21d9df
commit a63711b
Show file tree

Hide file tree

Showing 4 changed files with 37 additions and 5 deletions.
diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/BaseResolve.cs
@@ -304,7 +304,15 @@ protected void ResolveNewExpressions(ExpressionParameter parameter, int i, Expre
 
         protected void AppendNot(object Value)
         {
-            this.Context.Result.Append("NOT");
+            var isAppend = !this.Context.Result.Contains(ExpressionConst.Format0);
+            if (isAppend)
+            {
+                this.Context.Result.Append("NOT");
+            }
+            else
+            {
+                this.Context.Result.Replace(ExpressionConst.Format0, "NOT");
+            }
         }
     }
 }
diff --git a/...tCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/BinaryExpressionResolve.cs b/...tCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/BinaryExpressionResolve.cs
@@ -34,8 +34,8 @@ public BinaryExpressionResolve(ExpressionParameter parameter) : base(parameter)
                 var lsrb = !leftIsBinary && rightBinary;
                 var lbrb = rightBinary && leftIsBinary;
                 var lsbs = !leftIsBinary && !rightBinary;
-                var isBegin = !base.Context.Result.Contains(ExpressionConst.Format0);
-                if (isBegin)
+                var isAppend = !base.Context.Result.Contains(ExpressionConst.Format0);
+                if (isAppend)
                 {
                     base.Context.Result.Append(ExpressionConst.Format3);
                     base.Context.Result.Append(ExpressionConst.Format0);

diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Properties/AssemblyInfo.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Properties/AssemblyInfo.cs
@@ -17,5 +17,5 @@
 
 // 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.1.0.5")]
-[assembly: AssemblyFileVersion("4.1.0.5")]
+[assembly: AssemblyVersion("4.1.0.7")]
+[assembly: AssemblyFileVersion("4.1.0.7")]
diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarClient.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarClient.cs
@@ -251,6 +251,30 @@ public virtual ISugarQueryable<SugarDynamic> Queryable(string tableName, string
             DeleteableProvider<T> reval = base.CreateDeleteable<T>();
             return reval;
         }
+        public virtual IDeleteable<T> Deleteable<T>(Expression<Func<T, bool>> expression) where T : class, new()
+        {
+            return this.Deleteable<T>().Where(expression);
+        }
+        public virtual IDeleteable<T> Deleteable<T>(dynamic primaryKeyValue) where T : class, new()
+        {
+            return this.Deleteable<T>().In(primaryKeyValue);
+        }
+        public virtual IDeleteable<T> Deleteable<T>(dynamic [] primaryKeyValues) where T : class, new()
+        {
+            return this.Deleteable<T>().In(primaryKeyValues);
+        }
+        public virtual IDeleteable<T> Deleteable<T>(List<dynamic> pkValue) where T : class, new()
+        {
+            return this.Deleteable<T>().In(pkValue);
+        }
+        public virtual IDeleteable<T> Deleteable<T>(T deleteObj) where T : class, new()
+        {
+            return this.Deleteable<T>().Where(deleteObj);
+        }
+        public virtual IDeleteable<T> Deleteable<T>(List<T> deleteObjs) where T : class, new()
+        {
+            return this.Deleteable<T>().Where(deleteObjs);
+        }
         #endregion
 
         #region Updateable