## v0.5.1(五一版)

- 增加 ISelect/IInsert/IUpdate/IDelete.AsType 实现弱类型curd，如：Select<object>().AsType(实体类型)；
- 补充 ISelect.From<T2>；
- 补充 ExpressionTree 单元测试；
- 优化 ToList(a => new Dto())，会按优先级查询 Join 实体属性；
- 补充 IDelete/ISelect/IUpdate WhereDynamic 方法，实现 dywhere 条件；
- 修复 WhereObject 内部方法，当开启 Lazy 延时属性时，并且传递实体查询时条件无效；

FreeSql/Extensions/EntityUtilExtensions.cs

@@ -23,8 +23,7 @@ namespace FreeSql.Extensions.EntityUtil {
 		/// <param name="_table"></param>
 		/// <param name="entity"></param>
 		/// <returns></returns>
-		public static string GetEntityKeyString<TEntity>(this IFreeSql orm, TEntity entity, string splitString = "*|_,[,_|*") =>
+		//public static string GetEntityKeyString<TEntity>(this IFreeSql orm, TEntity entity, string splitString = "*|_,[,_|*") => GetEntityKeyString(orm, typeof(TEntity), entity, splitString);
-			GetEntityKeyString(orm, typeof(TEntity), entity, splitString);
 		public static string GetEntityKeyString(this IFreeSql orm, Type entityType, object entity, string splitString = "*|_,[,_|*") {
 			if (entity == null) return null;
 			if (entityType == null) entityType = entity.GetType();
@@ -110,8 +109,7 @@ namespace FreeSql.Extensions.EntityUtil {
 		/// <param name="_table"></param>
 		/// <param name="entity"></param>
 		/// <returns></returns>
-		public static object[] GetEntityKeyValues<TEntity>(this IFreeSql orm, TEntity entity) =>
+		//public static object[] GetEntityKeyValues<TEntity>(this IFreeSql orm, TEntity entity) => GetEntityKeyValues(orm, typeof(TEntity), entity);
-			GetEntityKeyValues(orm, typeof(TEntity), entity);
 		public static object[] GetEntityKeyValues(this IFreeSql orm, Type entityType, object entity) {
 			if (entity == null) return null;
 			if (entityType == null) entityType = entity.GetType();
@@ -150,8 +148,7 @@ namespace FreeSql.Extensions.EntityUtil {
 		/// <param name="_table"></param>
 		/// <param name="entity"></param>
 		/// <returns></returns>
-		public static string GetEntityString<TEntity>(this IFreeSql orm, TEntity entity) =>
+		//public static string GetEntityString<TEntity>(this IFreeSql orm, TEntity entity) => GetEntityString(orm, typeof(TEntity), entity);
-			GetEntityString(orm, typeof(TEntity), entity);
 		public static string GetEntityString(this IFreeSql orm, Type entityType, object entity) {
 			if (entity == null) return null;
 			if (entityType == null) entityType = entity.GetType();
@@ -195,8 +192,7 @@ namespace FreeSql.Extensions.EntityUtil {
 		/// 使用新实体的值，复盖旧实体的值
 		/// </summary>
 		static ConcurrentDictionary<DataType, ConcurrentDictionary<Type, Action<object, object>>> _dicMapEntityValue = new ConcurrentDictionary<DataType, ConcurrentDictionary<Type, Action<object, object>>>();
-		public static void MapEntityValue<TEntity>(this IFreeSql orm, TEntity entityFrom, TEntity entityTo) =>
+		//public static void MapEntityValue<TEntity>(this IFreeSql orm, TEntity entityFrom, TEntity entityTo) => MapEntityValue(orm, typeof(TEntity), entityFrom, entityTo);
-			MapEntityValue(orm, typeof(TEntity), entityFrom, entityTo);
 		public static void MapEntityValue(this IFreeSql orm, Type entityType, object entityFrom, object entityTo) {
 			if (entityType == null) entityType = entityFrom?.GetType() ?? entityTo?.GetType();
 			var func = _dicMapEntityValue.GetOrAdd(orm.Ado.DataType, dt => new ConcurrentDictionary<Type, Action<object, object>>()).GetOrAdd(entityType, t => {
@@ -235,8 +231,7 @@ namespace FreeSql.Extensions.EntityUtil {
 		/// <summary>
 		/// 使用新实体的主键值，复盖旧实体的主键值
 		/// </summary>
-		public static void MapEntityKeyValue<TEntity>(this IFreeSql orm, TEntity entityFrom, TEntity entityTo) =>
+		//public static void MapEntityKeyValue<TEntity>(this IFreeSql orm, TEntity entityFrom, TEntity entityTo) => MapEntityKeyValue(orm, typeof(TEntity), entityFrom, entityTo);
-			MapEntityKeyValue(orm, typeof(TEntity), entityFrom, entityTo);
 		public static void MapEntityKeyValue(this IFreeSql orm, Type entityType, object entityFrom, object entityTo) {
 			if (entityType == null) entityType = entityFrom?.GetType() ?? entityTo?.GetType();
 			var func = _dicMapEntityKeyValue.GetOrAdd(orm.Ado.DataType, dt => new ConcurrentDictionary<Type, Action<object, object>>()).GetOrAdd(entityType, t => {
@@ -271,8 +266,7 @@ namespace FreeSql.Extensions.EntityUtil {
 		/// <param name="orm"></param>
 		/// <param name="entity"></param>
 		/// <param name="idtval"></param>
-		public static void SetEntityIdentityValueWithPrimary<TEntity>(this IFreeSql orm, TEntity entity, long idtval) =>
+		//public static void SetEntityIdentityValueWithPrimary<TEntity>(this IFreeSql orm, TEntity entity, long idtval) => SetEntityIdentityValueWithPrimary(orm, typeof(TEntity), entity, idtval);
-			SetEntityIdentityValueWithPrimary(orm, typeof(TEntity), entity, idtval);
 		public static void SetEntityIdentityValueWithPrimary(this IFreeSql orm, Type entityType, object entity, long idtval) {
 			if (entity == null) return;
 			if (entityType == null) entityType = entity.GetType();
@@ -305,8 +299,7 @@ namespace FreeSql.Extensions.EntityUtil {
 		/// <typeparam name="TEntity"></typeparam>
 		/// <param name="orm"></param>
 		/// <param name="entity"></param>
-		public static long GetEntityIdentityValueWithPrimary<TEntity>(this IFreeSql orm, TEntity entity) =>
+		//public static long GetEntityIdentityValueWithPrimary<TEntity>(this IFreeSql orm, TEntity entity) => GetEntityIdentityValueWithPrimary(orm, typeof(TEntity), entity);
-			GetEntityIdentityValueWithPrimary(orm, typeof(TEntity), entity);
 		public static long GetEntityIdentityValueWithPrimary(this IFreeSql orm, Type entityType, object entity) {
 			if (entity == null) return 0;
 			if (entityType == null) entityType = entity.GetType();
@@ -353,8 +346,7 @@ namespace FreeSql.Extensions.EntityUtil {
 		/// <typeparam name="TEntity"></typeparam>
 		/// <param name="orm"></param>
 		/// <param name="entity"></param>
-		public static void ClearEntityPrimaryValueWithIdentityAndGuid<TEntity>(this IFreeSql orm, TEntity entity) =>
+		//public static void ClearEntityPrimaryValueWithIdentityAndGuid<TEntity>(this IFreeSql orm, TEntity entity) => ClearEntityPrimaryValueWithIdentityAndGuid(orm, typeof(TEntity), entity);
-			ClearEntityPrimaryValueWithIdentityAndGuid(orm, typeof(TEntity), entity);
 		public static void ClearEntityPrimaryValueWithIdentityAndGuid(this IFreeSql orm, Type entityType, object entity) {
 			if (entity == null) return;
 			if (entityType == null) entityType = entity.GetType();
@@ -389,8 +381,7 @@ namespace FreeSql.Extensions.EntityUtil {
 		/// <typeparam name="TEntity"></typeparam>
 		/// <param name="orm"></param>
 		/// <param name="entity"></param>
-		public static void ClearEntityPrimaryValueWithIdentity<TEntity>(this IFreeSql orm, TEntity entity) =>
+		//public static void ClearEntityPrimaryValueWithIdentity<TEntity>(this IFreeSql orm, TEntity entity) => ClearEntityPrimaryValueWithIdentity(orm, typeof(TEntity), entity);
-			ClearEntityPrimaryValueWithIdentity(orm, typeof(TEntity), entity);
 		public static void ClearEntityPrimaryValueWithIdentity(this IFreeSql orm, Type entityType, object entity) {
 			if (entity == null) return;
 			if (entityType == null) entityType = entity.GetType();
@@ -426,8 +417,7 @@ namespace FreeSql.Extensions.EntityUtil {
 		/// <param name="entity1"></param>
 		/// <param name="entity2"></param>
 		/// <returns></returns>
-		public static string[] CompareEntityValueReturnColumns<TEntity>(this IFreeSql orm, TEntity entity1, TEntity entity2, bool isEqual) =>
+		//public static string[] CompareEntityValueReturnColumns<TEntity>(this IFreeSql orm, TEntity entity1, TEntity entity2, bool isEqual) => CompareEntityValueReturnColumns(orm, typeof(TEntity), entity1, entity2, isEqual);
-			CompareEntityValueReturnColumns(orm, typeof(TEntity), entity1, entity2, isEqual);
 		public static string[] CompareEntityValueReturnColumns(this IFreeSql orm, Type entityType, object entity1, object entity2, bool isEqual) {
 			if (entityType == null) entityType = entity1?.GetType() ?? entity2?.GetType();
 			var func = _dicCompareEntityValueReturnColumns.GetOrAdd(orm.Ado.DataType, dt => new ConcurrentDictionary<Type, Func<object, object, bool, string[]>>()).GetOrAdd(entityType, t => {
@@ -481,8 +471,7 @@ namespace FreeSql.Extensions.EntityUtil {
 		/// <param name="entity"></param>
 		/// <param name="propertyName"></param>
 		/// <param name="value"></param>
-		public static void SetEntityIncrByWithPropertyName<TEntity>(this IFreeSql orm, TEntity entity, string propertyName, int incrBy) =>
+		//public static void SetEntityIncrByWithPropertyName<TEntity>(this IFreeSql orm, TEntity entity, string propertyName, int incrBy) => SetEntityIncrByWithPropertyName(orm, typeof(TEntity), entity, propertyName, incrBy);
-			SetEntityIncrByWithPropertyName(orm, typeof(TEntity), entity, propertyName, incrBy);
 		public static void SetEntityIncrByWithPropertyName(this IFreeSql orm, Type entityType, object entity, string propertyName, int incrBy) {
 			if (entity == null) return;
 			if (entityType == null) entityType = entity.GetType();
@@ -524,8 +513,7 @@ namespace FreeSql.Extensions.EntityUtil {
 		/// <param name="entity"></param>
 		/// <param name="propertyName"></param>
 		/// <param name="value"></param>
-		public static void SetEntityValueWithPropertyName<TEntity>(this IFreeSql orm, TEntity entity, string propertyName, object value) =>
+		//public static void SetEntityValueWithPropertyName<TEntity>(this IFreeSql orm, TEntity entity, string propertyName, object value) => SetEntityValueWithPropertyName(orm, typeof(TEntity), entity, propertyName, value);
-			SetEntityValueWithPropertyName(orm, typeof(TEntity), entity, propertyName, value);
 		public static void SetEntityValueWithPropertyName(this IFreeSql orm, Type entityType, object entity, string propertyName, object value) {
 			if (entity == null) return;
 			if (entityType == null) entityType = entity.GetType();
@@ -545,15 +533,12 @@ namespace FreeSql.Extensions.EntityUtil {
 						var prop = _table.Properties[pn];
 						exps.Add(
 							Expression.Assign(
-								Expression.MakeMemberAccess(var1Parm, prop),
-								Expression.Add(
 								Expression.MakeMemberAccess(var1Parm, prop),
 								Expression.Convert(
 									FreeSql.Internal.Utils.GetDataReaderValueBlockExpression(prop.PropertyType, parm3),
 									prop.PropertyType
 								)
 							)
-							)
 						);
 					}
 					return Expression.Lambda<Action<object, string, object>>(Expression.Block(new[] { var1Parm }, exps), new[] { parm1, parm2, parm3 }).Compile();

FreeSql/FreeSql.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>0.4.16.1</Version>
+		<Version>0.5.1</Version>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Authors>YeXiangQin</Authors>
 		<Description>FreeSql is the most convenient ORM in dotnet. It supports Mysql, Postgresql, SqlServer, Oracle and Sqlite.</Description>

FreeSql/Interface/Curd/IDelete.cs

@@ -53,6 +53,12 @@ namespace FreeSql {
 		/// <param name="notExists">不存在</param>
 		/// <returns></returns>
 		IDelete<T1> WhereExists<TEntity2>(ISelect<TEntity2> select, bool notExists = false) where TEntity2 : class;
+		/// <summary>
+		/// 传入动态对象如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
+		/// </summary>
+		/// <param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
+		/// <returns></returns>
+		IDelete<T1> WhereDynamic(object dywhere);
 
 		/// <summary>
 		/// 设置表名规则，可用于分库/分表，参数1：默认表名；返回值：新表名；
@@ -61,6 +67,12 @@ namespace FreeSql {
 		/// <returns></returns>
 		IDelete<T1> AsTable(Func<string, string> tableRule);
 		/// <summary>
+		/// 动态Type，在使用 Delete&lt;object&gt; 后使用本方法，指定实体类型
+		/// </summary>
+		/// <param name="entityType"></param>
+		/// <returns></returns>
+		IDelete<T1> AsType(Type entityType);
+		/// <summary>
 		/// 返回即将执行的SQL语句
 		/// </summary>
 		/// <returns></returns>

FreeSql/Interface/Curd/IInsert.cs

@@ -65,6 +65,12 @@ namespace FreeSql {
 		/// <returns></returns>
 		IInsert<T1> AsTable(Func<string, string> tableRule);
 		/// <summary>
+		/// 动态Type，在使用 Insert&lt;object&gt; 后使用本方法，指定实体类型
+		/// </summary>
+		/// <param name="entityType"></param>
+		/// <returns></returns>
+		IInsert<T1> AsType(Type entityType);
+		/// <summary>
 		/// 返回即将执行的SQL语句
 		/// </summary>
 		/// <returns></returns>

FreeSql/Interface/Curd/ISelect/ISelect1.cs

@@ -259,6 +259,12 @@ namespace FreeSql {
 		/// <param name="exp">lambda表达式</param>
 		/// <returns></returns>
 		ISelect<T1> Where<T2, T3, T4, T5>(Expression<Func<T1, T2, T3, T4, T5, bool>> exp) where T2 : class where T3 : class where T4 : class where T5 : class;
+		/// <summary>
+		/// 传入动态对象如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
+		/// </summary>
+		/// <param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
+		/// <returns></returns>
+		ISelect<T1> WhereDynamic(object dywhere);
 
 		/// <summary>
 		/// 按选择的列分组，GroupBy(a => a.Name) | GroupBy(a => new{a.Name,a.Time})

FreeSql/Interface/Curd/IUpdate.cs

@@ -120,6 +120,12 @@ namespace FreeSql {
 		/// <param name="notExists">不存在</param>
 		/// <returns></returns>
 		IUpdate<T1> WhereExists<TEntity2>(ISelect<TEntity2> select, bool notExists = false) where TEntity2 : class;
+		/// <summary>
+		/// 传入动态对象如：主键值 | new[]{主键值1,主键值2} | TEntity1 | new[]{TEntity1,TEntity2} | new{id=1}
+		/// </summary>
+		/// <param name="dywhere">主键值、主键值集合、实体、实体集合、匿名对象、匿名对象集合</param>
+		/// <returns></returns>
+		IUpdate<T1> WhereDynamic(object dywhere);
 
 		/// <summary>
 		/// 设置表名规则，可用于分库/分表，参数1：默认表名；返回值：新表名；
@@ -128,6 +134,12 @@ namespace FreeSql {
 		/// <returns></returns>
 		IUpdate<T1> AsTable(Func<string, string> tableRule);
 		/// <summary>
+		/// 动态Type，在使用 Update&lt;object&gt; 后使用本方法，指定实体类型
+		/// </summary>
+		/// <param name="entityType"></param>
+		/// <returns></returns>
+		IUpdate<T1> AsType(Type entityType);
+		/// <summary>
 		/// 返回即将执行的SQL语句
 		/// </summary>
 		/// <returns></returns>

FreeSql/Internal/CommonProvider/DeleteProvider.cs

@@ -28,7 +28,7 @@ namespace FreeSql.Internal.CommonProvider {
 			_commonExpression = commonExpression;
 			_table = _commonUtils.GetTableByEntity(typeof(T1));
 			this.Where(_commonUtils.WhereObject(_table, "", dywhere));
-			if (_orm.CodeFirst.IsAutoSyncStructure) _orm.CodeFirst.SyncStructure<T1>();
+			if (_orm.CodeFirst.IsAutoSyncStructure && typeof(T1) != typeof(object)) _orm.CodeFirst.SyncStructure<T1>();
 		}
 
 		protected void ClearData() {
@@ -81,11 +81,21 @@ namespace FreeSql.Internal.CommonProvider {
 		public IDelete<T1> Where(T1 item) => this.Where(new[] { item });
 		public IDelete<T1> Where(IEnumerable<T1> items) => this.Where(_commonUtils.WhereItems(_table, "", items));
 		public IDelete<T1> WhereExists<TEntity2>(ISelect<TEntity2> select, bool notExists = false) where TEntity2 : class => this.Where($"{(notExists ? "NOT " : "")}EXISTS({select.ToSql("1")})");
+		public IDelete<T1> WhereDynamic(object dywhere) => this.Where(_commonUtils.WhereObject(_table, "", dywhere));
 
 		public IDelete<T1> AsTable(Func<string, string> tableRule) {
 			_tableRule = tableRule;
 			return this;
 		}
+		public IDelete<T1> AsType(Type entityType) {
+			if (entityType == typeof(object)) throw new Exception("IDelete.AsType 参数不支持指定为 object");
+			if (entityType == _table.Type) return this;
+			var newtb = _commonUtils.GetTableByEntity(entityType);
+			_table = newtb ?? throw new Exception("IDelete.AsType 参数错误，请传入正确的实体类型");
+			if (_orm.CodeFirst.IsAutoSyncStructure) _orm.CodeFirst.SyncStructure(entityType);
+			return this;
+		}
+
 		public string ToSql() => _whereTimes <= 0 ? null : new StringBuilder().Append("DELETE FROM ").Append(_commonUtils.QuoteSqlName(_tableRule?.Invoke(_table.DbName) ?? _table.DbName)).Append(" WHERE ").Append(_where).ToString();
 	}
 }

FreeSql/Internal/CommonProvider/InsertProvider.cs

@@ -30,7 +30,7 @@ namespace FreeSql.Internal.CommonProvider {
 			_commonExpression = commonExpression;
 			_table = _commonUtils.GetTableByEntity(typeof(T1));
 			_noneParameter = _orm.CodeFirst.IsNoneCommandParameter;
-			if (_orm.CodeFirst.IsAutoSyncStructure) _orm.CodeFirst.SyncStructure<T1>();
+			if (_orm.CodeFirst.IsAutoSyncStructure && typeof(T1) != typeof(object)) _orm.CodeFirst.SyncStructure<T1>();
 		}
 
 		protected void ClearData() {
@@ -356,6 +356,15 @@ namespace FreeSql.Internal.CommonProvider {
 			_tableRule = tableRule;
 			return this;
 		}
+		public IInsert<T1> AsType(Type entityType) {
+			if (entityType == typeof(object)) throw new Exception("IInsert.AsType 参数不支持指定为 object");
+			if (entityType == _table.Type) return this;
+			var newtb = _commonUtils.GetTableByEntity(entityType);
+			_table = newtb ?? throw new Exception("IInsert.AsType 参数错误，请传入正确的实体类型");
+			if (_orm.CodeFirst.IsAutoSyncStructure) _orm.CodeFirst.SyncStructure(entityType);
+			return this;
+		}
+
 		public virtual string ToSql() {
 			if (_source == null || _source.Any() == false) return null;
 			var sb = new StringBuilder();

FreeSql/Internal/CommonProvider/SelectProvider/Select0Provider.cs

@@ -523,8 +523,7 @@ namespace FreeSql.Internal.CommonProvider {
 			if (entityType == typeof(object)) throw new Exception("ISelect.AsType 参数不支持指定为 object");
 			if (entityType == _tables[0].Table.Type) return this as TSelect;
 			var newtb = _commonUtils.GetTableByEntity(entityType);
-			if (newtb == null) throw new Exception("ISelect.AsType 参数错误，请传入正确的实体类型");
+			_tables[0].Table = newtb ?? throw new Exception("ISelect.AsType 参数错误，请传入正确的实体类型");
-			_tables[0].Table = newtb;
 			if (_orm.CodeFirst.IsAutoSyncStructure) _orm.CodeFirst.SyncStructure(entityType);
 			return this as TSelect;
 		}

FreeSql/Internal/CommonProvider/SelectProvider/Select1Provider.cs

@@ -218,6 +218,7 @@ namespace FreeSql.Internal.CommonProvider {
 			_tables[0].Parameter = exp.Parameters[0];
 			return this.InternalWhere(exp?.Body);
 		}
+		public ISelect<T1> WhereDynamic(object dywhere) => this.Where(_commonUtils.WhereObject(_tables.First().Table, $"{_tables.First().Alias}.", dywhere));
 
 		public ISelect<T1> WhereIf(bool condition, Expression<Func<T1, bool>> exp) {
 			if (condition == false) return this;

FreeSql/Internal/CommonProvider/UpdateProvider.cs

@@ -35,7 +35,7 @@ namespace FreeSql.Internal.CommonProvider {
 			_table = _commonUtils.GetTableByEntity(typeof(T1));
 			_noneParameter = _orm.CodeFirst.IsNoneCommandParameter;
 			this.Where(_commonUtils.WhereObject(_table, "", dywhere));
-			if (_orm.CodeFirst.IsAutoSyncStructure) _orm.CodeFirst.SyncStructure<T1>();
+			if (_orm.CodeFirst.IsAutoSyncStructure && typeof(T1) != typeof(object)) _orm.CodeFirst.SyncStructure<T1>();
 		}
 
 		protected void ClearData() {
@@ -69,7 +69,7 @@ namespace FreeSql.Internal.CommonProvider {
 				if (affrows != _source.Count)
 					throw new Exception($"记录可能不存在，或者【行级乐观锁】版本过旧，更新数量{_source.Count}，影响的行数{affrows}。");
 				foreach (var d in _source)
-					_orm.SetEntityIncrByWithPropertyName(d, _table.VersionColumn.CsName, 1);
+					_orm.SetEntityIncrByWithPropertyName(_table.Type, d, _table.VersionColumn.CsName, 1);
 			}
 		}
 
@@ -347,6 +347,7 @@ namespace FreeSql.Internal.CommonProvider {
 		public IUpdate<T1> Where(T1 item) => this.Where(new[] { item });
 		public IUpdate<T1> Where(IEnumerable<T1> items) => this.Where(_commonUtils.WhereItems(_table, "", items));
 		public IUpdate<T1> WhereExists<TEntity2>(ISelect<TEntity2> select, bool notExists = false) where TEntity2 : class => this.Where($"{(notExists ? "NOT " : "")}EXISTS({select.ToSql("1")})");
+		public IUpdate<T1> WhereDynamic(object dywhere) => this.Where(_commonUtils.WhereObject(_table, "", dywhere));
 
 		protected string WhereCaseSource(string CsName, Func<string, string> thenValue) {
 			if (_source.Any() == false) return null;
@@ -401,6 +402,15 @@ namespace FreeSql.Internal.CommonProvider {
 			_tableRule = tableRule;
 			return this;
 		}
+		public IUpdate<T1> AsType(Type entityType) {
+			if (entityType == typeof(object)) throw new Exception("IUpdate.AsType 参数不支持指定为 object");
+			if (entityType == _table.Type) return this;
+			var newtb = _commonUtils.GetTableByEntity(entityType);
+			_table = newtb ?? throw new Exception("IUpdate.AsType 参数错误，请传入正确的实体类型");
+			if (_orm.CodeFirst.IsAutoSyncStructure) _orm.CodeFirst.SyncStructure(entityType);
+			return this;
+		}
+
 		public string ToSql() {
 			if (_where.Length == 0 && _source.Any() == false) return null;
 

FreeSql/Internal/CommonUtils.cs

@@ -91,7 +91,7 @@ namespace FreeSql.Internal {
 			var primarys = table.Columns.Values.Where(a => a.Attribute.IsPrimary == true).ToArray();
 			if (primarys.Length == 1 && (type == primarys.First().CsType || type.IsNumberType() && primarys.First().CsType.IsNumberType())) {
 				return $"{aliasAndDot}{this.QuoteSqlName(primarys.First().Attribute.Name)} = {this.FormatSql("{0}", dywhere)}";
-			} else if (primarys.Length > 0 && type.FullName == table.Type.FullName) {
+			} else if (primarys.Length > 0 && (type == table.Type || type.BaseType == table.Type)) {
 				var sb = new StringBuilder();
 				var pkidx = 0;
 				foreach (var pk in primarys) {