From f17754c6f9462b82e1a73c3941202d7bc1c14f33 Mon Sep 17 00:00:00 2001
From: skx <610262374@qq.com>
Date: Tue, 29 Dec 2020 13:06:45 +0800
Subject: [PATCH] SubQuery support join

---
 .../SqlServerTest/Demo/Demo1_Queryable.cs     |  6 +-
 .../SqlServerTest/SqlServerTest.csproj        |  3 +
 .../QueryableProvider/QueryableProvider.cs    |  2 +-
 .../SqlBuilderProvider/SqlBuilderProvider.cs  |  4 ++
 .../Common/MapperExpression.cs                |  1 +
 .../ExpressionsToSql/ExpressionContext.cs     |  1 +
 .../ResolveItems/MapperExpressionResolve.cs   | 11 +++-
 .../Subquery/Items/SubLeftJoin.cs             | 62 +++++++++++++++++++
 .../ExpressionsToSql/Subquery/SubTools.cs     |  1 +
 .../ExpressionsToSql/Subquery/Subquerable.cs  | 10 +++
 .../SqlSugar/Properties/AssemblyInfo.cs       |  4 +-
 Src/Asp.Net/SqlSugar/SqlSugar.csproj          |  1 +
 12 files changed, 99 insertions(+), 7 deletions(-)
 create mode 100644 Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Items/SubLeftJoin.cs

diff --git a/Src/Asp.Net/SqlServerTest/Demo/Demo1_Queryable.cs b/Src/Asp.Net/SqlServerTest/Demo/Demo1_Queryable.cs
index 07e88fb72..b50886cea 100644
--- a/Src/Asp.Net/SqlServerTest/Demo/Demo1_Queryable.cs
+++ b/Src/Asp.Net/SqlServerTest/Demo/Demo1_Queryable.cs
@@ -122,7 +122,11 @@ namespace OrmTest
                 customName2 = SqlFunc.Subqueryable<Custom>().Where("it.CustomId = id").Where(s => true).Select(s => s.Name)
             }).ToList();
 
-            var list2 = db.Queryable<Order>().Where(it => SqlFunc.Subqueryable<OrderItem>().Where(i => i.OrderId == it.Id).Any()).ToList();
+            var list2 = db.Queryable<Order>().Where(it =>
+            SqlFunc.Subqueryable<OrderItem>() 
+             .LeftJoin<OrderItem>((i,y)=>i.ItemId==y.ItemId)
+             .Where<OrderItem>((i,y) => y.ItemId== it.Id).Any()
+            ).ToList();
 
             Console.WriteLine("#### Subquery End ####");
         }
diff --git a/Src/Asp.Net/SqlServerTest/SqlServerTest.csproj b/Src/Asp.Net/SqlServerTest/SqlServerTest.csproj
index 6963c7221..bf12d1263 100644
--- a/Src/Asp.Net/SqlServerTest/SqlServerTest.csproj
+++ b/Src/Asp.Net/SqlServerTest/SqlServerTest.csproj
@@ -196,6 +196,9 @@
       <SubType>Designer</SubType>
     </None>
   </ItemGroup>
+  <ItemGroup>
+    <Folder Include="UnitTest\models\" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
index 68436e235..297a70610 100644
--- a/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
+++ b/Src/Asp.Net/SqlSugar/Abstract/QueryableProvider/QueryableProvider.cs
@@ -132,7 +132,7 @@ namespace SqlSugar
             {
                 CallContext.MapperExpression.Value = new List<MapperExpression>();
             }
-            CallContext.MapperExpression.Value.Add(new MapperExpression() { QueryBuilder = this.QueryBuilder, Type=MapperExpressionType.oneToOne, FillExpression=mapperObject, MappingField1Expression= mapperField,Context=this.Context });
+            CallContext.MapperExpression.Value.Add(new MapperExpression() { SqlBuilder= SqlBuilder, QueryBuilder = this.QueryBuilder, Type=MapperExpressionType.oneToOne, FillExpression=mapperObject, MappingField1Expression= mapperField,Context=this.Context });
             return _Mapper<TObject>(mapperObject, mapperField);
         }
 
diff --git a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs
index b32e80b64..922fb8de3 100644
--- a/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs
+++ b/Src/Asp.Net/SqlSugar/Abstract/SqlBuilderProvider/SqlBuilderProvider.cs
@@ -69,6 +69,10 @@ namespace SqlSugar
         public virtual string GetTranslationColumnName(string propertyName)
         {
             if (propertyName.Contains(SqlTranslationLeft)) return propertyName;
+            if (propertyName.Contains("."))
+            {
+                return string.Join(".", propertyName.Split('.').Select(it => SqlTranslationLeft + it + SqlTranslationRight));
+            }
             else
                 return SqlTranslationLeft + propertyName + SqlTranslationRight;
         }
diff --git a/Src/Asp.Net/SqlSugar/ExpressionsToSql/Common/MapperExpression.cs b/Src/Asp.Net/SqlSugar/ExpressionsToSql/Common/MapperExpression.cs
index 0b64570fd..f00167e82 100644
--- a/Src/Asp.Net/SqlSugar/ExpressionsToSql/Common/MapperExpression.cs
+++ b/Src/Asp.Net/SqlSugar/ExpressionsToSql/Common/MapperExpression.cs
@@ -15,6 +15,7 @@ namespace SqlSugar
         public Expression MappingField2Expression { get; set; }
         public SqlSugarProvider Context { get; set; }
         public QueryBuilder QueryBuilder { get;  set; }
+        public ISqlBuilder SqlBuilder { get;  set; }
     }
 
     public enum MapperExpressionType
diff --git a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ExpressionContext.cs b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ExpressionContext.cs
index e9e99494f..19e3aed3c 100644
--- a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ExpressionContext.cs
+++ b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ExpressionContext.cs
@@ -36,6 +36,7 @@ namespace SqlSugar
             }
         }
         public int SubQueryIndex { get; set; }
+        public int JoinIndex { get; set; }
         public int Index { get; set; }
         public int ParameterIndex { get; set; }
         public string SingleTableNameSubqueryShortName{ get;  set; }
diff --git a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MapperExpressionResolve.cs b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MapperExpressionResolve.cs
index 3437c5254..f97c6888b 100644
--- a/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MapperExpressionResolve.cs
+++ b/Src/Asp.Net/SqlSugar/ExpressionsToSql/ResolveItems/MapperExpressionResolve.cs
@@ -12,6 +12,7 @@ namespace SqlSugar
         private InvalidOperationException ex;
         private SqlSugarProvider context;
         private QueryBuilder querybuiler;
+        private ISqlBuilder sqlBuilder;
         private string sql;
         public MapperExpressionResolve(Expression expression, InvalidOperationException ex)
         {
@@ -77,10 +78,13 @@ namespace SqlSugar
             {
                 pkColumn = selectInfo.EntityInfo.Columns.First();
             }
+            var tableName = sqlBuilder.GetTranslationTableName(fillInfo.EntityInfo.DbTableName);
+            var whereLeft = sqlBuilder.GetTranslationColumnName(pkColumn.DbColumnName);
+            var whereRight = sqlBuilder.GetTranslationColumnName(mappingFild1Info.FieldString);
             this.sql = this.context.Queryable<object>()
-                                                        .AS(fillInfo.EntityInfo.DbTableName)
-                                                        .Where(string.Format(" {0}={1} ", pkColumn.DbColumnName, mappingFild1Info.FieldString))
-                                                        .Select(selectInfo.FieldName).ToSql().Key;
+                                                        .AS(tableName)
+                                                        .Where(string.Format(" {0}={1} ",whereLeft , whereRight))
+                                                        .Select(sqlBuilder.GetTranslationColumnName(selectInfo.FieldName)).ToSql().Key;
         }
 
         private void oneToMany()
@@ -160,6 +164,7 @@ namespace SqlSugar
         {
             this.querybuiler = mapper.QueryBuilder;
             this.context = mapper.Context;
+            this.sqlBuilder = mapper.SqlBuilder;
             if (this.querybuiler.TableShortName.IsNullOrEmpty())
             {
                 this.querybuiler.TableShortName = (childExpression as MemberExpression).Expression.ToString();
diff --git a/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Items/SubLeftJoin.cs b/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Items/SubLeftJoin.cs
new file mode 100644
index 000000000..5bc58bf4f
--- /dev/null
+++ b/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Items/SubLeftJoin.cs
@@ -0,0 +1,62 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
+
+namespace SqlSugar 
+{
+    public class SubLeftJoin : ISubOperation
+    {
+
+        public bool HasWhere
+        {
+            get; set;
+        }
+
+        public string Name
+        {
+            get { return "LeftJoin"; }
+        }
+
+        public Expression Expression
+        {
+            get; set;
+        }
+
+        public int Sort
+        {
+            get
+            {
+                return 301;
+            }
+        }
+
+        public ExpressionContext Context
+        {
+            get; set;
+        }
+
+        public string GetValue(Expression expression)
+        {
+            var exp = expression as MethodCallExpression;
+            var argExp = exp.Arguments[0];
+            var name =this.Context.GetTranslationColumnName((argExp as LambdaExpression).Parameters[0].Name);
+            var parameter = (argExp as LambdaExpression).Parameters[1];
+            Context.InitMappingInfo(parameter.Type);
+            var tableName= Context.GetTranslationTableName(parameter.Type.Name, true);
+            var joinString =string.Format(" {2} LEFT JOIN {1} {0} ",
+                 this.Context.GetTranslationColumnName(parameter.Name), 
+                 tableName,
+                 this.Context.JoinIndex==0?name:"");
+            var result = joinString+ "ON " + SubTools.GetMethodValue(Context, argExp, ResolveExpressType.WhereMultiple);
+            //var selfParameterName = Context.GetTranslationColumnName((argExp as LambdaExpression).Parameters.First().Name) + UtilConstants.Dot;
+            this.Context.JoinIndex++;
+
+            //result = result.Replace(selfParameterName, SubTools.GetSubReplace(this.Context));
+            return result;
+        }
+    }
+}
diff --git a/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/SubTools.cs b/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/SubTools.cs
index 8896c09c5..041d5f2be 100644
--- a/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/SubTools.cs
+++ b/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/SubTools.cs
@@ -16,6 +16,7 @@ namespace SqlSugar
                                                     new SubSelect() { Context=Context },
                                                     new SubWhere(){ Context=Context },
                                                     new SubWhereIF(){ Context=Context },
+                                                    new SubLeftJoin(){ Context=Context },
                                                     new SubAnd(){ Context=Context },
                                                     new SubAndIF(){ Context=Context },
                                                     new SubAny(){ Context=Context },
diff --git a/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Subquerable.cs b/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Subquerable.cs
index 3d6f77278..ba7a1b9b6 100644
--- a/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Subquerable.cs
+++ b/Src/Asp.Net/SqlSugar/ExpressionsToSql/Subquery/Subquerable.cs
@@ -9,6 +9,16 @@ namespace SqlSugar
 
     public class Subqueryable<T> where T : class, new()
     {
+
+        public Subqueryable<T> InnerJoin<JoinType>(Func<T, JoinType, bool> expression)
+        {
+            return this;
+        }
+        public Subqueryable<T> LeftJoin<JoinType>(Func<T, JoinType, bool> expression)
+        {
+            return this;
+        }
+   
         public Subqueryable<T> Where(string where)
         {
             return this;
diff --git a/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs b/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs
index 7dd5cd7b3..9c9047330 100644
--- a/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs
+++ b/Src/Asp.Net/SqlSugar/Properties/AssemblyInfo.cs
@@ -31,5 +31,5 @@ using System.Runtime.InteropServices;
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("5.0.1.7")]
-[assembly: AssemblyFileVersion("5.0.1.7")]
+[assembly: AssemblyVersion("5.0.1.8")]
+[assembly: AssemblyFileVersion("5.0.1.8")]
diff --git a/Src/Asp.Net/SqlSugar/SqlSugar.csproj b/Src/Asp.Net/SqlSugar/SqlSugar.csproj
index 9a718a07b..762fa2a19 100644
--- a/Src/Asp.Net/SqlSugar/SqlSugar.csproj
+++ b/Src/Asp.Net/SqlSugar/SqlSugar.csproj
@@ -92,6 +92,7 @@
     <Compile Include="Entities\SubInsertTree.cs" />
     <Compile Include="ExpressionsToSql\Common\MapperExpression.cs" />
     <Compile Include="ExpressionsToSql\ResolveItems\MapperExpressionResolve.cs" />
+    <Compile Include="ExpressionsToSql\Subquery\Items\SubLeftJoin.cs" />
     <Compile Include="OnlyNet\Compatible.cs" />
     <Compile Include="OnlyNet\KdbndpInserttable.cs" />
     <Compile Include="Interface\ISubInsertable.cs" />