From 46c187e4462f4d1e020c52cced77f04a964f58b8 Mon Sep 17 00:00:00 2001
From: 28810 <28810@YEXIANGQIN>
Date: Sun, 16 Aug 2020 15:28:49 +0800
Subject: [PATCH] =?UTF-8?q?-=20=E8=A1=A5=E5=85=85=20Ado.Net=20=E5=A4=9A?=
 =?UTF-8?q?=E8=A1=A8=E7=9A=84=E6=89=A9=E5=B1=95=E6=96=B9=E6=B3=95=20Select?=
 =?UTF-8?q?<T1..T10>=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../MySqlConnectionExtensionsTest.cs          |   7 ++
 FreeSql/Extensions/FreeSqlGlobalExtensions.cs | 110 ++++++++++++++++++
 2 files changed, 117 insertions(+)

diff --git a/FreeSql.Tests/FreeSql.Tests/AdoNetExtensions/MySqlConnectionExtensionsTest.cs b/FreeSql.Tests/FreeSql.Tests/AdoNetExtensions/MySqlConnectionExtensionsTest.cs
index c16eb020..7f4a3296 100644
--- a/FreeSql.Tests/FreeSql.Tests/AdoNetExtensions/MySqlConnectionExtensionsTest.cs
+++ b/FreeSql.Tests/FreeSql.Tests/AdoNetExtensions/MySqlConnectionExtensionsTest.cs
@@ -1,6 +1,7 @@
 using MySql.Data.MySqlClient;
 using System;
 using System.Collections.Generic;
+using System.Diagnostics;
 using Xunit;
 
 namespace FreeSql.Tests.AdoNetExtensions.MySqlConnectionExtensions {
@@ -10,6 +11,12 @@ namespace FreeSql.Tests.AdoNetExtensions.MySqlConnectionExtensions {
 
 		public Methods() {
 			g.mysql.CodeFirst.SyncStructure<TestConnectionExt>();
+			using (var conn = new MySqlConnection(_connectString))
+			{
+				var fsql = conn.GetIFreeSql();
+				fsql.CodeFirst.IsNoneCommandParameter = true;
+				fsql.Aop.CommandBefore += (_, e) => Trace.WriteLine("SQL: " + e.Command.CommandText);
+			}
 		}
 
 		[Fact]
diff --git a/FreeSql/Extensions/FreeSqlGlobalExtensions.cs b/FreeSql/Extensions/FreeSqlGlobalExtensions.cs
index e72c637b..8870e1c3 100644
--- a/FreeSql/Extensions/FreeSqlGlobalExtensions.cs
+++ b/FreeSql/Extensions/FreeSqlGlobalExtensions.cs
@@ -674,6 +674,61 @@ SELECT ");
     /// <param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
     /// <returns></returns>
     public static IDelete<T1> Delete<T1>(this IDbConnection that, object dywhere) where T1 : class => GetCrud(that).Delete<T1>(dywhere).WithConnection(that as DbConnection);
+
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2> Select<T1, T2>(this IDbConnection that) where T1 : class where T2 : class =>
+        GetCrud(that).Select<T1>().From<T2>((s, b) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3> Select<T1, T2, T3>(this IDbConnection that) where T1 : class where T2 : class where T3 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3>((s, b, c) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3, T4> Select<T1, T2, T3, T4>(this IDbConnection that) where T1 : class where T2 : class where T3 : class where T4 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3, T4>((s, b, c, d) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3, T4, T5> Select<T1, T2, T3, T4, T5>(this IDbConnection that) where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3, T4, T5>((s, b, c, d, e) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3, T4, T5, T6> Select<T1, T2, T3, T4, T5, T6>(this IDbConnection that) where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3, T4, T5, T6>((s, b, c, d, e, f) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3, T4, T5, T6, T7> Select<T1, T2, T3, T4, T5, T6, T7>(this IDbConnection that) where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3, T4, T5, T6, T7>((s, b, c, d, e, f, g) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3, T4, T5, T6, T7, T8> Select<T1, T2, T3, T4, T5, T6, T7, T8>(this IDbConnection that) where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3, T4, T5, T6, T7, T8>((s, b, c, d, e, f, g, h) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9> Select<T1, T2, T3, T4, T5, T6, T7, T8, T9>(this IDbConnection that) where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3, T4, T5, T6, T7, T8, T9>((s, b, c, d, e, f, g, h, i) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Select<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(this IDbConnection that) where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3, T4, T5, T6, T7, T8, T9, T10>((s, b, c, d, e, f, g, h, i, j) => s);
     #endregion
 
     #region IDbTransaction
@@ -770,6 +825,61 @@ SELECT ");
     /// <param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
     /// <returns></returns>
     public static IDelete<T1> Delete<T1>(this IDbTransaction that, object dywhere) where T1 : class => GetCrud(that).Delete<T1>(dywhere).WithTransaction(that as DbTransaction);
+    
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2> Select<T1, T2>(this IDbTransaction that) where T1 : class where T2 : class =>
+        GetCrud(that).Select<T1>().From<T2>((s, b) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3> Select<T1, T2, T3>(this IDbTransaction that) where T1 : class where T2 : class where T3 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3>((s, b, c) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3, T4> Select<T1, T2, T3, T4>(this IDbTransaction that) where T1 : class where T2 : class where T3 : class where T4 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3, T4>((s, b, c, d) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3, T4, T5> Select<T1, T2, T3, T4, T5>(this IDbTransaction that) where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3, T4, T5>((s, b, c, d, e) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3, T4, T5, T6> Select<T1, T2, T3, T4, T5, T6>(this IDbTransaction that) where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3, T4, T5, T6>((s, b, c, d, e, f) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3, T4, T5, T6, T7> Select<T1, T2, T3, T4, T5, T6, T7>(this IDbTransaction that) where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3, T4, T5, T6, T7>((s, b, c, d, e, f, g) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3, T4, T5, T6, T7, T8> Select<T1, T2, T3, T4, T5, T6, T7, T8>(this IDbTransaction that) where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3, T4, T5, T6, T7, T8>((s, b, c, d, e, f, g, h) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9> Select<T1, T2, T3, T4, T5, T6, T7, T8, T9>(this IDbTransaction that) where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3, T4, T5, T6, T7, T8, T9>((s, b, c, d, e, f, g, h, i) => s);
+    /// <summary>
+    /// 多表查询
+    /// </summary>
+    /// <returns></returns>
+    public static ISelect<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10> Select<T1, T2, T3, T4, T5, T6, T7, T8, T9, T10>(this IDbTransaction that) where T1 : class where T2 : class where T3 : class where T4 : class where T5 : class where T6 : class where T7 : class where T8 : class where T9 : class where T10 : class =>
+        GetCrud(that).Select<T1>().From<T2, T3, T4, T5, T6, T7, T8, T9, T10>((s, b, c, d, e, f, g, h, i, j) => s);
     #endregion
 
     #endregion