diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs index 495bebd1b..fd5e65d5c 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/CodeFirstProvider/CodeFirstProvider.cs @@ -206,7 +206,7 @@ namespace SqlSugar } protected virtual string GetTableName(EntityInfo entityInfo) { - return entityInfo.DbTableName == null ? entityInfo.EntityName : entityInfo.DbTableName; + return this.Context.EntityProvider.GetTableName(entityInfo.DbTableName); } protected virtual DbColumnInfo EntityColumnToDbColumn(EntityInfo entityInfo, string tableName, EntityColumnInfo item) { diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/EntityProvider/EntityProvider.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/EntityProvider/EntityProvider.cs index a3bb497d6..b486e3a70 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/EntityProvider/EntityProvider.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/EntityProvider/EntityProvider.cs @@ -59,6 +59,16 @@ namespace SqlSugar return mappingInfo == null ? typeName : mappingInfo.DbTableName; } } + public string GetTableName(string entityName) + { + var typeName = entityName; + if (this.Context.MappingTables == null || this.Context.MappingTables.Count == 0) return typeName; + else + { + var mappingInfo = this.Context.MappingTables.SingleOrDefault(it => it.EntityName == typeName); + return mappingInfo == null ? typeName : mappingInfo.DbTableName; + } + } public string GetEntityName(string tableName) { if (this.Context.MappingTables == null || this.Context.MappingTables.Count == 0) return tableName; diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs index 31069b8a0..5cba61142 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Abstract/InsertableProvider/InsertableProvider.cs @@ -201,7 +201,7 @@ namespace SqlSugar { if (this.Context.IsSystemTablesConfig) { - return this.Context.DbMaintenance.GetPrimaries(this.EntityInfo.DbTableName); + return this.Context.DbMaintenance.GetPrimaries(this.Context.EntityProvider.GetTableName(this.EntityInfo.EntityName)); } else { @@ -212,7 +212,7 @@ namespace SqlSugar { if (this.Context.IsSystemTablesConfig) { - return this.Context.DbMaintenance.GetIsIdentities(this.EntityInfo.DbTableName); + return this.Context.DbMaintenance.GetIsIdentities(this.Context.EntityProvider.GetTableName(this.EntityInfo.EntityName)); } else { diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/TypeParameterExpressionReolve.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/TypeParameterExpressionReolve.cs index e2eac6897..057247669 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/TypeParameterExpressionReolve.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/ExpressionsToSql/ResolveItems/TypeParameterExpressionReolve.cs @@ -18,11 +18,20 @@ namespace SqlSugar break; case ResolveExpressType.WhereMultiple: break; - case ResolveExpressType.SelectSingle: - case ResolveExpressType.SelectMultiple: case ResolveExpressType.Update: parameter.BaseParameter.CommonTempData = expression.Name; break; + case ResolveExpressType.SelectSingle: + case ResolveExpressType.SelectMultiple: + if (parameter.BaseParameter!=null&¶meter.BaseParameter.CurrentExpression.NodeType == ExpressionType.Lambda) + { + this.Context.Result.Append(expression.Name + ".*"); + } + else + { + parameter.BaseParameter.CommonTempData = expression.Name; + } + break; case ResolveExpressType.FieldSingle: break; case ResolveExpressType.FieldMultiple: diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Properties/AssemblyInfo.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Properties/AssemblyInfo.cs index 5bc7d4433..8c5443413 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Properties/AssemblyInfo.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Properties/AssemblyInfo.cs @@ -17,5 +17,5 @@ using System.Runtime.InteropServices; // 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.9")] -[assembly: AssemblyFileVersion("4.1.0.9")] +[assembly: AssemblyVersion("4.1.1.0")] +[assembly: AssemblyFileVersion("4.1.1.0")] diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs index b479772df..78a856aa9 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/Realization/MySql/SqlBuilder/MySqlQueryBuilder.cs @@ -47,7 +47,7 @@ namespace SqlSugar else if (Skip != null && Take != null) { if (this.OrderByValue == "ORDER BY ") this.OrderByValue += GetSelectValue.Split(',')[0]; - return string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, GetOrderByString, Skip.ObjToInt() > 0 ? Skip.ObjToInt() : 0, Take); + return string.Format(PageTempalte, GetSelectValue, GetTableNameString, GetWhereValueString, GetGroupByString + HavingInfos, GetOrderByString, Skip.ObjToInt() > 0 ? Skip.ObjToInt(): 0, Take); } else { @@ -55,7 +55,7 @@ namespace SqlSugar } } - + #endregion #region Get SQL Partial diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarClient.cs b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarClient.cs index 5581f3f6d..8a0643283 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarClient.cs +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarClient.cs @@ -284,6 +284,11 @@ namespace SqlSugar UpdateableProvider reval = base.CreateUpdateable(UpdateObjs); return reval; } + public virtual IUpdateable Updateable(List UpdateObjs) where T : class, new() + { + Check.ArgumentNullException(UpdateObjs, "Updateable.UpdateObjs can't be null"); + return Updateable(UpdateObjs.ToArray()); + } public virtual IUpdateable Updateable(T UpdateObj) where T : class, new() { return this.Updateable(new T[] { UpdateObj }); diff --git a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec index 88f7ce1d3..61b7537d0 100644 --- a/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec +++ b/Src/Asp.NetCore/SqlServerTest/src/SqlSugar/SqlSugarForCore.nuspec @@ -2,7 +2,7 @@ sqlSugarCore - 4.1.0.9 + 4.1.1.0 sunkaixuan Landa http://www.apache.org/licenses/LICENSE-2.0.html