From cbdd78636320a4195fe4d3dadfe5c5b6a905fc87 Mon Sep 17 00:00:00 2001
From: sunkaixuan <610262374@qq.com>
Date: Tue, 21 Feb 2023 16:35:04 +0800
Subject: [PATCH] Synchronization code

---
 .../Abstract/InsertableProvider/InsertableProvider.cs     | 2 ++
 .../Subquery/Items/SubEnableTableFilter.cs                | 2 +-
 .../MySql/SqlBuilder/MySqlExpressionContext.cs            | 8 ++++----
 .../PostgreSQL/SqlBuilder/PostgreSQLExpressionContext.cs  | 8 ++++----
 4 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs b/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs
index 672d2c36c..a1a90fa31 100644
--- a/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs
@@ -51,6 +51,7 @@ namespace SqlSugar
             string sql = _ExecuteCommand();
             var result = Ado.ExecuteCommand(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray());
             After(sql, null);
+            if (result == -1) return this.InsertObjs.Count();
             return result;
         }
         public virtual string ToSqlString()
@@ -311,6 +312,7 @@ namespace SqlSugar
             string sql = _ExecuteCommand();
             var result =await Ado.ExecuteCommandAsync(sql, InsertBuilder.Parameters == null ? null : InsertBuilder.Parameters.ToArray());
             After(sql, null);
+            if (result == -1) return this.InsertObjs.Count();
             return result;
         }
         public virtual async Task<int> ExecuteReturnIdentityAsync()
diff --git a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/Subquery/Items/SubEnableTableFilter.cs b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/Subquery/Items/SubEnableTableFilter.cs
index 78c49397b..66fbb0559 100644
--- a/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/Subquery/Items/SubEnableTableFilter.cs
+++ b/Src/Asp.NetCore2/SqlSugar/ExpressionsToSql/Subquery/Items/SubEnableTableFilter.cs
@@ -56,7 +56,7 @@ namespace SqlSugar
                         if (field != null)
                         {
                             Type ChildType = item.GetType().GetProperty("type", flag).GetValue(item, null) as Type;
-                            if (ChildType == type)
+                            if (ChildType == type|| ChildType.IsInterface)
                             {
                                 var entityInfo = db.EntityMaintenance.GetEntityInfo(ChildType);
                                 var exp = field.GetValue(item, null) as Expression;
diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/MySql/SqlBuilder/MySqlExpressionContext.cs b/Src/Asp.NetCore2/SqlSugar/Realization/MySql/SqlBuilder/MySqlExpressionContext.cs
index 336d7d0ae..486e03498 100644
--- a/Src/Asp.NetCore2/SqlSugar/Realization/MySql/SqlBuilder/MySqlExpressionContext.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Realization/MySql/SqlBuilder/MySqlExpressionContext.cs
@@ -222,22 +222,22 @@ namespace SqlSugar
         {
             if (UtilMethods.IsNumber(model.Args[1].MemberValue.GetType().Name))
             {
-                return $"JSON_CONTAINS({model.Args[0].MemberName}, '{model.Args[1].MemberValue}')";
+                return $" JSON_CONTAINS({model.Args[0].MemberName}, '{model.Args[1].MemberValue}')";
             }
             else
             {
-                return $"JSON_CONTAINS({model.Args[0].MemberName}, '\"{model.Args[1].MemberValue.ObjToStringNoTrim().ToSqlFilter()}\"')";
+                return $" JSON_CONTAINS({model.Args[0].MemberName}, '\"{model.Args[1].MemberValue.ObjToStringNoTrim().ToSqlFilter()}\"')";
             }
         }
         public override string JsonListObjectAny(MethodCallExpressionModel model)
         {
             if (UtilMethods.IsNumber(model.Args[2].MemberValue.GetType().Name))
             {
-                return $"JSON_CONTAINS({model.Args[0].MemberName},'{{\"{model.Args[1].MemberValue}\":{model.Args[2].MemberValue}}}')";
+                return $" JSON_CONTAINS({model.Args[0].MemberName},'{{\"{model.Args[1].MemberValue}\":{model.Args[2].MemberValue}}}')";
             }
             else
             {
-                return $"JSON_CONTAINS({model.Args[0].MemberName},'{{\"{model.Args[1].MemberValue}\":\"{model.Args[2].MemberValue.ObjToStringNoTrim().ToSqlFilter()}\"}}')";
+                return $" JSON_CONTAINS({model.Args[0].MemberName},'{{\"{model.Args[1].MemberValue}\":\"{model.Args[2].MemberValue.ObjToStringNoTrim().ToSqlFilter()}\"}}')";
             }
         }
     }
diff --git a/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLExpressionContext.cs b/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLExpressionContext.cs
index cebea6248..b74148165 100644
--- a/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLExpressionContext.cs
+++ b/Src/Asp.NetCore2/SqlSugar/Realization/PostgreSQL/SqlBuilder/PostgreSQLExpressionContext.cs
@@ -448,22 +448,22 @@ namespace SqlSugar
         {
             if (UtilMethods.IsNumber(model.Args[1].MemberValue.GetType().Name))
             {
-                return $"{model.Args[0].MemberName}::jsonb @> '[{model.Args[1].MemberValue.ObjToStringNoTrim().ToSqlFilter()}]'::jsonb";
+                return $" {model.Args[0].MemberName}::jsonb @> '[{model.Args[1].MemberValue.ObjToStringNoTrim().ToSqlFilter()}]'::jsonb";
             }
             else 
             {
-                return $"{model.Args[0].MemberName}::jsonb @> '[\"{model.Args[1].MemberValue}\"]'::jsonb";
+                return $" {model.Args[0].MemberName}::jsonb @> '[\"{model.Args[1].MemberValue}\"]'::jsonb";
             }
         }
         public override string JsonListObjectAny(MethodCallExpressionModel model)
         {
             if (UtilMethods.IsNumber(model.Args[2].MemberValue.GetType().Name))
             {
-                return $"{model.Args[0].MemberName}::jsonb @> '[{{\"{model.Args[1].MemberValue}\":{model.Args[2].MemberValue}}}]'::jsonb";
+                return $" {model.Args[0].MemberName}::jsonb @> '[{{\"{model.Args[1].MemberValue}\":{model.Args[2].MemberValue}}}]'::jsonb";
             }
             else
             {
-                return $"{model.Args[0].MemberName}::jsonb @> '[{{\"{model.Args[1].MemberValue}\":\"{model.Args[2].MemberValue.ObjToStringNoTrim().ToSqlFilter()}\"}}]'::jsonb";
+                return $" {model.Args[0].MemberName}::jsonb @> '[{{\"{model.Args[1].MemberValue}\":\"{model.Args[2].MemberValue.ObjToStringNoTrim().ToSqlFilter()}\"}}]'::jsonb";
             }
         }
     }