fix for 2 or more returning columns on update

gpanayotov · Sep 9, 2018 · 913c9fd · 913c9fd
1 parent 294b6d6
commit 913c9fd
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/EFCore.FirebirdSql/Update/Internal/FbUpdateSqlGenerator.cs b/EFCore.FirebirdSql/Update/Internal/FbUpdateSqlGenerator.cs
@@ -74,7 +74,7 @@ public override ResultSetMapping AppendUpdateOperation(StringBuilder commandStri
             var writeOperations = operations.Where(o => o.IsWrite).ToList();
             var readOperations = operations.Where(o => o.IsRead).ToList();
             var conditionOperations = operations.Where(o => o.IsCondition).ToList();
-			var inputOperations = GenerateParameters(operations.Where(o => o.IsWrite || o.IsCondition)).ToList();           
+			var inputOperations = GenerateParameters(operations.Where(o => o.IsWrite || o.IsCondition)).ToList();
  			var anyRead = readOperations.Any();
             commandStringBuilder.Append("EXECUTE BLOCK (");
     		commandStringBuilder.AppendJoin(inputOperations, (b, p) =>
@@ -118,10 +118,15 @@ public override ResultSetMapping AppendUpdateOperation(StringBuilder commandStri
             {
                 commandStringBuilder.AppendLine();
                 commandStringBuilder.Append("RETURNING ");
+
                 commandStringBuilder.AppendJoin(readOperations, (b, e) =>
                 {
                     b.Append(SqlGenerationHelper.DelimitIdentifier(e.ColumnName));
-                    b.Append(" INTO :");
+                }, ", ");
+				commandStringBuilder.Append(" INTO ");
+                commandStringBuilder.AppendJoin(readOperations, (b, e) =>
+                {
+                    b.Append(" :");
                     b.Append(SqlGenerationHelper.DelimitIdentifier(e.ColumnName));
                 }, ", ");
             }