diff --git a/FreeSql/Interface/Curd/ISelect/ISelect2`16.cs b/FreeSql/Interface/Curd/ISelect/ISelect2`16.cs index 79183225..75288be2 100644 --- a/FreeSql/Interface/Curd/ISelect/ISelect2`16.cs +++ b/FreeSql/Interface/Curd/ISelect/ISelect2`16.cs @@ -90,6 +90,7 @@ namespace FreeSql ISelect OrderByIf(bool condition, Expression> column, bool descending = false); ISelect WithSql(string sqlT1, string sqlT2, object parms = null); + ISelect As(string aliasT1, string aliasT2); ISelect WithTempQuery(Expression> selector); @@ -206,6 +207,7 @@ namespace FreeSql ISelect OrderByIf(bool condition, Expression> column, bool descending = false); ISelect WithSql(string sqlT1, string sqlT2, string sqlT3, object parms = null); + ISelect As(string aliasT1, string aliasT2, string aliasT3); ISelect WithTempQuery(Expression> selector); @@ -322,6 +324,7 @@ namespace FreeSql ISelect OrderByIf(bool condition, Expression> column, bool descending = false); ISelect WithSql(string sqlT1, string sqlT2, string sqlT3, string sqlT4, object parms = null); + ISelect As(string aliasT1, string aliasT2, string aliasT3, string aliasT4); ISelect WithTempQuery(Expression> selector); @@ -438,6 +441,7 @@ namespace FreeSql ISelect OrderByIf(bool condition, Expression> column, bool descending = false); ISelect WithSql(string sqlT1, string sqlT2, string sqlT3, string sqlT4, string sqlT5, object parms = null); + ISelect As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5); ISelect WithTempQuery(Expression> selector); @@ -554,6 +558,7 @@ namespace FreeSql ISelect OrderByIf(bool condition, Expression> column, bool descending = false); ISelect WithSql(string sqlT1, string sqlT2, string sqlT3, string sqlT4, string sqlT5, string sqlT6, object parms = null); + ISelect As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6); ISelect WithTempQuery(Expression> selector); @@ -670,6 +675,7 @@ namespace FreeSql ISelect OrderByIf(bool condition, Expression> column, bool descending = false); ISelect WithSql(string sqlT1, string sqlT2, string sqlT3, string sqlT4, string sqlT5, string sqlT6, string sqlT7, object parms = null); + ISelect As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7); ISelect WithTempQuery(Expression> selector); @@ -786,6 +792,7 @@ namespace FreeSql ISelect OrderByIf(bool condition, Expression> column, bool descending = false); ISelect WithSql(string sqlT1, string sqlT2, string sqlT3, string sqlT4, string sqlT5, string sqlT6, string sqlT7, string sqlT8, object parms = null); + ISelect As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8); ISelect WithTempQuery(Expression> selector); @@ -902,6 +909,7 @@ namespace FreeSql ISelect OrderByIf(bool condition, Expression> column, bool descending = false); ISelect WithSql(string sqlT1, string sqlT2, string sqlT3, string sqlT4, string sqlT5, string sqlT6, string sqlT7, string sqlT8, string sqlT9, object parms = null); + ISelect As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9); ISelect WithTempQuery(Expression> selector); @@ -1018,6 +1026,7 @@ namespace FreeSql ISelect OrderByIf(bool condition, Expression> column, bool descending = false); ISelect WithSql(string sqlT1, string sqlT2, string sqlT3, string sqlT4, string sqlT5, string sqlT6, string sqlT7, string sqlT8, string sqlT9, string sqlT10, object parms = null); + ISelect As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9, string aliasT10); ISelect WithTempQuery(Expression> selector); @@ -1134,6 +1143,7 @@ namespace FreeSql ISelect OrderByIf(bool condition, Expression> column, bool descending = false); ISelect WithSql(string sqlT1, string sqlT2, string sqlT3, string sqlT4, string sqlT5, string sqlT6, string sqlT7, string sqlT8, string sqlT9, string sqlT10, string sqlT11, object parms = null); + ISelect As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9, string aliasT10, string aliasT11); ISelect WithTempQuery(Expression> selector); @@ -1250,6 +1260,7 @@ namespace FreeSql ISelect OrderByIf(bool condition, Expression> column, bool descending = false); ISelect WithSql(string sqlT1, string sqlT2, string sqlT3, string sqlT4, string sqlT5, string sqlT6, string sqlT7, string sqlT8, string sqlT9, string sqlT10, string sqlT11, string sqlT12, object parms = null); + ISelect As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9, string aliasT10, string aliasT11, string aliasT12); ISelect WithTempQuery(Expression> selector); @@ -1366,6 +1377,7 @@ namespace FreeSql ISelect OrderByIf(bool condition, Expression> column, bool descending = false); ISelect WithSql(string sqlT1, string sqlT2, string sqlT3, string sqlT4, string sqlT5, string sqlT6, string sqlT7, string sqlT8, string sqlT9, string sqlT10, string sqlT11, string sqlT12, string sqlT13, object parms = null); + ISelect As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9, string aliasT10, string aliasT11, string aliasT12, string aliasT13); ISelect WithTempQuery(Expression> selector); @@ -1482,6 +1494,7 @@ namespace FreeSql ISelect OrderByIf(bool condition, Expression> column, bool descending = false); ISelect WithSql(string sqlT1, string sqlT2, string sqlT3, string sqlT4, string sqlT5, string sqlT6, string sqlT7, string sqlT8, string sqlT9, string sqlT10, string sqlT11, string sqlT12, string sqlT13, string sqlT14, object parms = null); + ISelect As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9, string aliasT10, string aliasT11, string aliasT12, string aliasT13, string aliasT14); ISelect WithTempQuery(Expression> selector); @@ -1598,6 +1611,7 @@ namespace FreeSql ISelect OrderByIf(bool condition, Expression> column, bool descending = false); ISelect WithSql(string sqlT1, string sqlT2, string sqlT3, string sqlT4, string sqlT5, string sqlT6, string sqlT7, string sqlT8, string sqlT9, string sqlT10, string sqlT11, string sqlT12, string sqlT13, string sqlT14, string sqlT15, object parms = null); + ISelect As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9, string aliasT10, string aliasT11, string aliasT12, string aliasT13, string aliasT14, string aliasT15); ISelect WithTempQuery(Expression> selector); @@ -1714,6 +1728,7 @@ namespace FreeSql ISelect OrderByIf(bool condition, Expression> column, bool descending = false); ISelect WithSql(string sqlT1, string sqlT2, string sqlT3, string sqlT4, string sqlT5, string sqlT6, string sqlT7, string sqlT8, string sqlT9, string sqlT10, string sqlT11, string sqlT12, string sqlT13, string sqlT14, string sqlT15, string sqlT16, object parms = null); + ISelect As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9, string aliasT10, string aliasT11, string aliasT12, string aliasT13, string aliasT14, string aliasT15, string aliasT16); ISelect WithTempQuery(Expression> selector); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider2`16.cs b/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider2`16.cs index b8eb5d4f..b5369daf 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider2`16.cs +++ b/FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider2`16.cs @@ -35,6 +35,13 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect ISelect.As(string aliasT1, string aliasT2) + { + if (string.IsNullOrEmpty(aliasT1) == false) _tables[0].Alias = aliasT1; + if (string.IsNullOrEmpty(aliasT2) == false) _tables[1].Alias = aliasT2; + return this; + } + ISelect ISelect.WithTempQuery(Expression> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a]; @@ -501,6 +508,14 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect ISelect.As(string aliasT1, string aliasT2, string aliasT3) + { + if (string.IsNullOrEmpty(aliasT1) == false) _tables[0].Alias = aliasT1; + if (string.IsNullOrEmpty(aliasT2) == false) _tables[1].Alias = aliasT2; + if (string.IsNullOrEmpty(aliasT3) == false) _tables[2].Alias = aliasT3; + return this; + } + ISelect ISelect.WithTempQuery(Expression> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a]; @@ -969,6 +984,15 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect ISelect.As(string aliasT1, string aliasT2, string aliasT3, string aliasT4) + { + if (string.IsNullOrEmpty(aliasT1) == false) _tables[0].Alias = aliasT1; + if (string.IsNullOrEmpty(aliasT2) == false) _tables[1].Alias = aliasT2; + if (string.IsNullOrEmpty(aliasT3) == false) _tables[2].Alias = aliasT3; + if (string.IsNullOrEmpty(aliasT4) == false) _tables[3].Alias = aliasT4; + return this; + } + ISelect ISelect.WithTempQuery(Expression> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a]; @@ -1439,6 +1463,16 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect ISelect.As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5) + { + if (string.IsNullOrEmpty(aliasT1) == false) _tables[0].Alias = aliasT1; + if (string.IsNullOrEmpty(aliasT2) == false) _tables[1].Alias = aliasT2; + if (string.IsNullOrEmpty(aliasT3) == false) _tables[2].Alias = aliasT3; + if (string.IsNullOrEmpty(aliasT4) == false) _tables[3].Alias = aliasT4; + if (string.IsNullOrEmpty(aliasT5) == false) _tables[4].Alias = aliasT5; + return this; + } + ISelect ISelect.WithTempQuery(Expression> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a]; @@ -1911,6 +1945,17 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect ISelect.As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6) + { + if (string.IsNullOrEmpty(aliasT1) == false) _tables[0].Alias = aliasT1; + if (string.IsNullOrEmpty(aliasT2) == false) _tables[1].Alias = aliasT2; + if (string.IsNullOrEmpty(aliasT3) == false) _tables[2].Alias = aliasT3; + if (string.IsNullOrEmpty(aliasT4) == false) _tables[3].Alias = aliasT4; + if (string.IsNullOrEmpty(aliasT5) == false) _tables[4].Alias = aliasT5; + if (string.IsNullOrEmpty(aliasT6) == false) _tables[5].Alias = aliasT6; + return this; + } + ISelect ISelect.WithTempQuery(Expression> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a]; @@ -2385,6 +2430,18 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect ISelect.As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7) + { + if (string.IsNullOrEmpty(aliasT1) == false) _tables[0].Alias = aliasT1; + if (string.IsNullOrEmpty(aliasT2) == false) _tables[1].Alias = aliasT2; + if (string.IsNullOrEmpty(aliasT3) == false) _tables[2].Alias = aliasT3; + if (string.IsNullOrEmpty(aliasT4) == false) _tables[3].Alias = aliasT4; + if (string.IsNullOrEmpty(aliasT5) == false) _tables[4].Alias = aliasT5; + if (string.IsNullOrEmpty(aliasT6) == false) _tables[5].Alias = aliasT6; + if (string.IsNullOrEmpty(aliasT7) == false) _tables[6].Alias = aliasT7; + return this; + } + ISelect ISelect.WithTempQuery(Expression> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a]; @@ -2861,6 +2918,19 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect ISelect.As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8) + { + if (string.IsNullOrEmpty(aliasT1) == false) _tables[0].Alias = aliasT1; + if (string.IsNullOrEmpty(aliasT2) == false) _tables[1].Alias = aliasT2; + if (string.IsNullOrEmpty(aliasT3) == false) _tables[2].Alias = aliasT3; + if (string.IsNullOrEmpty(aliasT4) == false) _tables[3].Alias = aliasT4; + if (string.IsNullOrEmpty(aliasT5) == false) _tables[4].Alias = aliasT5; + if (string.IsNullOrEmpty(aliasT6) == false) _tables[5].Alias = aliasT6; + if (string.IsNullOrEmpty(aliasT7) == false) _tables[6].Alias = aliasT7; + if (string.IsNullOrEmpty(aliasT8) == false) _tables[7].Alias = aliasT8; + return this; + } + ISelect ISelect.WithTempQuery(Expression> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a]; @@ -3339,6 +3409,20 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect ISelect.As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9) + { + if (string.IsNullOrEmpty(aliasT1) == false) _tables[0].Alias = aliasT1; + if (string.IsNullOrEmpty(aliasT2) == false) _tables[1].Alias = aliasT2; + if (string.IsNullOrEmpty(aliasT3) == false) _tables[2].Alias = aliasT3; + if (string.IsNullOrEmpty(aliasT4) == false) _tables[3].Alias = aliasT4; + if (string.IsNullOrEmpty(aliasT5) == false) _tables[4].Alias = aliasT5; + if (string.IsNullOrEmpty(aliasT6) == false) _tables[5].Alias = aliasT6; + if (string.IsNullOrEmpty(aliasT7) == false) _tables[6].Alias = aliasT7; + if (string.IsNullOrEmpty(aliasT8) == false) _tables[7].Alias = aliasT8; + if (string.IsNullOrEmpty(aliasT9) == false) _tables[8].Alias = aliasT9; + return this; + } + ISelect ISelect.WithTempQuery(Expression> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a]; @@ -3819,6 +3903,21 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect ISelect.As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9, string aliasT10) + { + if (string.IsNullOrEmpty(aliasT1) == false) _tables[0].Alias = aliasT1; + if (string.IsNullOrEmpty(aliasT2) == false) _tables[1].Alias = aliasT2; + if (string.IsNullOrEmpty(aliasT3) == false) _tables[2].Alias = aliasT3; + if (string.IsNullOrEmpty(aliasT4) == false) _tables[3].Alias = aliasT4; + if (string.IsNullOrEmpty(aliasT5) == false) _tables[4].Alias = aliasT5; + if (string.IsNullOrEmpty(aliasT6) == false) _tables[5].Alias = aliasT6; + if (string.IsNullOrEmpty(aliasT7) == false) _tables[6].Alias = aliasT7; + if (string.IsNullOrEmpty(aliasT8) == false) _tables[7].Alias = aliasT8; + if (string.IsNullOrEmpty(aliasT9) == false) _tables[8].Alias = aliasT9; + if (string.IsNullOrEmpty(aliasT10) == false) _tables[9].Alias = aliasT10; + return this; + } + ISelect ISelect.WithTempQuery(Expression> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a]; @@ -4301,6 +4400,22 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect ISelect.As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9, string aliasT10, string aliasT11) + { + if (string.IsNullOrEmpty(aliasT1) == false) _tables[0].Alias = aliasT1; + if (string.IsNullOrEmpty(aliasT2) == false) _tables[1].Alias = aliasT2; + if (string.IsNullOrEmpty(aliasT3) == false) _tables[2].Alias = aliasT3; + if (string.IsNullOrEmpty(aliasT4) == false) _tables[3].Alias = aliasT4; + if (string.IsNullOrEmpty(aliasT5) == false) _tables[4].Alias = aliasT5; + if (string.IsNullOrEmpty(aliasT6) == false) _tables[5].Alias = aliasT6; + if (string.IsNullOrEmpty(aliasT7) == false) _tables[6].Alias = aliasT7; + if (string.IsNullOrEmpty(aliasT8) == false) _tables[7].Alias = aliasT8; + if (string.IsNullOrEmpty(aliasT9) == false) _tables[8].Alias = aliasT9; + if (string.IsNullOrEmpty(aliasT10) == false) _tables[9].Alias = aliasT10; + if (string.IsNullOrEmpty(aliasT11) == false) _tables[10].Alias = aliasT11; + return this; + } + ISelect ISelect.WithTempQuery(Expression> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a]; @@ -4785,6 +4900,23 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect ISelect.As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9, string aliasT10, string aliasT11, string aliasT12) + { + if (string.IsNullOrEmpty(aliasT1) == false) _tables[0].Alias = aliasT1; + if (string.IsNullOrEmpty(aliasT2) == false) _tables[1].Alias = aliasT2; + if (string.IsNullOrEmpty(aliasT3) == false) _tables[2].Alias = aliasT3; + if (string.IsNullOrEmpty(aliasT4) == false) _tables[3].Alias = aliasT4; + if (string.IsNullOrEmpty(aliasT5) == false) _tables[4].Alias = aliasT5; + if (string.IsNullOrEmpty(aliasT6) == false) _tables[5].Alias = aliasT6; + if (string.IsNullOrEmpty(aliasT7) == false) _tables[6].Alias = aliasT7; + if (string.IsNullOrEmpty(aliasT8) == false) _tables[7].Alias = aliasT8; + if (string.IsNullOrEmpty(aliasT9) == false) _tables[8].Alias = aliasT9; + if (string.IsNullOrEmpty(aliasT10) == false) _tables[9].Alias = aliasT10; + if (string.IsNullOrEmpty(aliasT11) == false) _tables[10].Alias = aliasT11; + if (string.IsNullOrEmpty(aliasT12) == false) _tables[11].Alias = aliasT12; + return this; + } + ISelect ISelect.WithTempQuery(Expression> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a]; @@ -5271,6 +5403,24 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect ISelect.As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9, string aliasT10, string aliasT11, string aliasT12, string aliasT13) + { + if (string.IsNullOrEmpty(aliasT1) == false) _tables[0].Alias = aliasT1; + if (string.IsNullOrEmpty(aliasT2) == false) _tables[1].Alias = aliasT2; + if (string.IsNullOrEmpty(aliasT3) == false) _tables[2].Alias = aliasT3; + if (string.IsNullOrEmpty(aliasT4) == false) _tables[3].Alias = aliasT4; + if (string.IsNullOrEmpty(aliasT5) == false) _tables[4].Alias = aliasT5; + if (string.IsNullOrEmpty(aliasT6) == false) _tables[5].Alias = aliasT6; + if (string.IsNullOrEmpty(aliasT7) == false) _tables[6].Alias = aliasT7; + if (string.IsNullOrEmpty(aliasT8) == false) _tables[7].Alias = aliasT8; + if (string.IsNullOrEmpty(aliasT9) == false) _tables[8].Alias = aliasT9; + if (string.IsNullOrEmpty(aliasT10) == false) _tables[9].Alias = aliasT10; + if (string.IsNullOrEmpty(aliasT11) == false) _tables[10].Alias = aliasT11; + if (string.IsNullOrEmpty(aliasT12) == false) _tables[11].Alias = aliasT12; + if (string.IsNullOrEmpty(aliasT13) == false) _tables[12].Alias = aliasT13; + return this; + } + ISelect ISelect.WithTempQuery(Expression> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a]; @@ -5759,6 +5909,25 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect ISelect.As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9, string aliasT10, string aliasT11, string aliasT12, string aliasT13, string aliasT14) + { + if (string.IsNullOrEmpty(aliasT1) == false) _tables[0].Alias = aliasT1; + if (string.IsNullOrEmpty(aliasT2) == false) _tables[1].Alias = aliasT2; + if (string.IsNullOrEmpty(aliasT3) == false) _tables[2].Alias = aliasT3; + if (string.IsNullOrEmpty(aliasT4) == false) _tables[3].Alias = aliasT4; + if (string.IsNullOrEmpty(aliasT5) == false) _tables[4].Alias = aliasT5; + if (string.IsNullOrEmpty(aliasT6) == false) _tables[5].Alias = aliasT6; + if (string.IsNullOrEmpty(aliasT7) == false) _tables[6].Alias = aliasT7; + if (string.IsNullOrEmpty(aliasT8) == false) _tables[7].Alias = aliasT8; + if (string.IsNullOrEmpty(aliasT9) == false) _tables[8].Alias = aliasT9; + if (string.IsNullOrEmpty(aliasT10) == false) _tables[9].Alias = aliasT10; + if (string.IsNullOrEmpty(aliasT11) == false) _tables[10].Alias = aliasT11; + if (string.IsNullOrEmpty(aliasT12) == false) _tables[11].Alias = aliasT12; + if (string.IsNullOrEmpty(aliasT13) == false) _tables[12].Alias = aliasT13; + if (string.IsNullOrEmpty(aliasT14) == false) _tables[13].Alias = aliasT14; + return this; + } + ISelect ISelect.WithTempQuery(Expression> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a]; @@ -6249,6 +6418,26 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect ISelect.As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9, string aliasT10, string aliasT11, string aliasT12, string aliasT13, string aliasT14, string aliasT15) + { + if (string.IsNullOrEmpty(aliasT1) == false) _tables[0].Alias = aliasT1; + if (string.IsNullOrEmpty(aliasT2) == false) _tables[1].Alias = aliasT2; + if (string.IsNullOrEmpty(aliasT3) == false) _tables[2].Alias = aliasT3; + if (string.IsNullOrEmpty(aliasT4) == false) _tables[3].Alias = aliasT4; + if (string.IsNullOrEmpty(aliasT5) == false) _tables[4].Alias = aliasT5; + if (string.IsNullOrEmpty(aliasT6) == false) _tables[5].Alias = aliasT6; + if (string.IsNullOrEmpty(aliasT7) == false) _tables[6].Alias = aliasT7; + if (string.IsNullOrEmpty(aliasT8) == false) _tables[7].Alias = aliasT8; + if (string.IsNullOrEmpty(aliasT9) == false) _tables[8].Alias = aliasT9; + if (string.IsNullOrEmpty(aliasT10) == false) _tables[9].Alias = aliasT10; + if (string.IsNullOrEmpty(aliasT11) == false) _tables[10].Alias = aliasT11; + if (string.IsNullOrEmpty(aliasT12) == false) _tables[11].Alias = aliasT12; + if (string.IsNullOrEmpty(aliasT13) == false) _tables[12].Alias = aliasT13; + if (string.IsNullOrEmpty(aliasT14) == false) _tables[13].Alias = aliasT14; + if (string.IsNullOrEmpty(aliasT15) == false) _tables[14].Alias = aliasT15; + return this; + } + ISelect ISelect.WithTempQuery(Expression> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a]; @@ -6741,6 +6930,27 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect ISelect.As(string aliasT1, string aliasT2, string aliasT3, string aliasT4, string aliasT5, string aliasT6, string aliasT7, string aliasT8, string aliasT9, string aliasT10, string aliasT11, string aliasT12, string aliasT13, string aliasT14, string aliasT15, string aliasT16) + { + if (string.IsNullOrEmpty(aliasT1) == false) _tables[0].Alias = aliasT1; + if (string.IsNullOrEmpty(aliasT2) == false) _tables[1].Alias = aliasT2; + if (string.IsNullOrEmpty(aliasT3) == false) _tables[2].Alias = aliasT3; + if (string.IsNullOrEmpty(aliasT4) == false) _tables[3].Alias = aliasT4; + if (string.IsNullOrEmpty(aliasT5) == false) _tables[4].Alias = aliasT5; + if (string.IsNullOrEmpty(aliasT6) == false) _tables[5].Alias = aliasT6; + if (string.IsNullOrEmpty(aliasT7) == false) _tables[6].Alias = aliasT7; + if (string.IsNullOrEmpty(aliasT8) == false) _tables[7].Alias = aliasT8; + if (string.IsNullOrEmpty(aliasT9) == false) _tables[8].Alias = aliasT9; + if (string.IsNullOrEmpty(aliasT10) == false) _tables[9].Alias = aliasT10; + if (string.IsNullOrEmpty(aliasT11) == false) _tables[10].Alias = aliasT11; + if (string.IsNullOrEmpty(aliasT12) == false) _tables[11].Alias = aliasT12; + if (string.IsNullOrEmpty(aliasT13) == false) _tables[12].Alias = aliasT13; + if (string.IsNullOrEmpty(aliasT14) == false) _tables[13].Alias = aliasT14; + if (string.IsNullOrEmpty(aliasT15) == false) _tables[14].Alias = aliasT15; + if (string.IsNullOrEmpty(aliasT16) == false) _tables[15].Alias = aliasT16; + return this; + } + ISelect ISelect.WithTempQuery(Expression> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a]; diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/T4Temp/ISelect2`16.tt b/FreeSql/Internal/CommonProvider/SelectProvider/T4Temp/ISelect2`16.tt index 73017de9..ab2ef317 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/T4Temp/ISelect2`16.tt +++ b/FreeSql/Internal/CommonProvider/SelectProvider/T4Temp/ISelect2`16.tt @@ -119,6 +119,7 @@ public interface ISelect<<#=NewStr #>> : ISelect0>, T1> <#= ISelect<<#=NewStr #>> OrderByIf(bool condition, Expression, TMember>> column, bool descending = false); ISelect<<#=NewStr #>> WithSql(<#=string.Join(",",WithSql)#>, object parms = null); + ISelect<<#=NewStr #>> As(<#=string.Join(",",WithSql).Replace("string sqlT", "string aliasT")#>); ISelect WithTempQuery(Expression, TDto>> selector); diff --git a/FreeSql/Internal/CommonProvider/SelectProvider/T4Temp/Select1Provider2`16.tt b/FreeSql/Internal/CommonProvider/SelectProvider/T4Temp/Select1Provider2`16.tt index 4ea97916..f9884a84 100644 --- a/FreeSql/Internal/CommonProvider/SelectProvider/T4Temp/Select1Provider2`16.tt +++ b/FreeSql/Internal/CommonProvider/SelectProvider/T4Temp/Select1Provider2`16.tt @@ -25,6 +25,7 @@ namespace FreeSql.Internal.CommonProvider var whereStr = ""; var ISelectGroupingAggregate = new List(); var WithSql = new List(); + var Alias = new List(); List SyncStructure = new List(); StringBuilder _tables = new StringBuilder(); @@ -53,6 +54,7 @@ namespace FreeSql.Internal.CommonProvider { ISelectGroupingAggregate.Add($"ISelectGroupingAggregate"); WithSql.Add($"string sqlT{i}"); + Alias.Add($"if (string.IsNullOrEmpty(aliasT" + i + ") == false) _tables[" + (i-1) + "].Alias = aliasT" + i + ";"); GetToListDtoSelector.Add("Expression.Parameter(typeof(T" + i + "), \"" + (abc[i - 1]) + "\")"); AsTable.Append("if (type == _tables[" + (i - 1) + "].Table?.Type && string.IsNullOrEmpty(sqlT" + i + @@ -83,6 +85,12 @@ namespace FreeSql.Internal.CommonProvider return this; } + ISelect<<#=NewStr #>> ISelect<<#=NewStr #>>.As(<#=string.Join(",", WithSql).Replace("string sqlT", "string aliasT") #>) + { + <#=string.Join("\r\n ", Alias) #> + return this; + } + ISelect ISelect<<#=NewStr #>>.WithTempQuery(Expression, TDto>> selector) { for (var a = 0; a < selector.Parameters.Count; a++) _tables[a].Parameter = selector.Parameters[a];