修复 SqlServer 工作单元 bug #23

需要同时设置 SqlCommand.Connection + Transaction

Author: 28810

FreeSql/Extensions/EntityUtilExtensions.cs

@@ -43,9 +43,7 @@ public static string GetEntityKeyString(this IFreeSql orm, Type entityType, obje
 				for (var a = 0; a < pks.Length; a++) {
 					var isguid = pks[a].CsType.NullableTypeOrThis() == typeof(Guid);
 					Expression expthen = null;
-					if (isguid == false)
-						expthen = Expression.Assign(var3IsNull, Expression.Constant(true));
-					else {
+					if (isguid) {
 						expthen = Expression.Block(
 							new Expression[]{
 								Expression.Assign(Expression.MakeMemberAccess(var1Parm, _table.Properties[pks[a].CsName]), Expression.Call(MethodFreeUtilNewMongodbId)),
@@ -55,6 +53,17 @@ public static string GetEntityKeyString(this IFreeSql orm, Type entityType, obje
 								)
 							}.Where(c => c != null).ToArray()
 						);
+					} else if (pks.Length > 1 && pks[a].Attribute.IsIdentity) {
+						expthen = Expression.Block(
+								new Expression[]{
+									a > 0 ? Expression.Call(var2Sb, MethodStringBuilderAppend, Expression.Constant(splitString)) : null,
+									Expression.Call(var2Sb, MethodStringBuilderAppend,
+										Expression.Convert(Expression.MakeMemberAccess(var1Parm, _table.Properties[pks[a].CsName]), typeof(object))
+									)
+								}.Where(c => c != null).ToArray()
+							);
+					} else {
+						expthen = Expression.Assign(var3IsNull, Expression.Constant(true));
 					}
 					if (pks[a].Attribute.IsIdentity || isguid || pks[a].CsType == typeof(string) || pks[a].CsType.IsNullableType()) {
 						exps.Add(

FreeSql/FreeSql.csproj

@@ -2,7 +2,7 @@
 
 	<PropertyGroup>
 		<TargetFramework>netstandard2.0</TargetFramework>
-		<Version>0.5.1.3</Version>
+		<Version>0.5.2</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/Internal/CommonProvider/AdoProvider/AdoProvider.cs

@@ -323,6 +323,8 @@ public object ExecuteScalar(DbConnection connection, DbTransaction transaction,
 					isclose = true;
 				}
 				cmd.Connection = connection;
+				if (transaction.Connection == connection)
+					cmd.Transaction = transaction;
 			}
 
 			if (IsTracePerformance) dt = DateTime.Now;