Fix merge error of wrong index of calculated column in IncludeProvider's header

alex-kulakov · alex-kulakov · commit 022c688305e5 · 2026-03-27T18:20:18.000+05:00
diff --git a/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/IncludeProvider.cs b/Orm/Xtensive.Orm/Orm/Rse/Providers/Compilable/IncludeProvider.cs
@@ -56,7 +56,7 @@ public sealed class IncludeProvider: UnaryProvider,
     private static RecordSetHeader BuildHeaderAndFilteredTupleDescriptor(
       CompilableProvider source, IReadOnlyList<int> filteredColumns, string resultColumnName, out TupleDescriptor filteredTupleDescriptor)
     {
-      var header = source.Header.Add(new SystemColumn(resultColumnName, 0, WellKnownTypes.Bool));
+      var header = source.Header.Add(new SystemColumn(resultColumnName, source.Header.Length, WellKnownTypes.Bool));
       var columnCount = filteredColumns.Count;
       var fieldTypes = new Type[columnCount];
       for (var index = 0; index < columnCount; index++) {

Original file line number	Diff line number	Diff line change
`@@ -56,7 +56,7 @@ public sealed class IncludeProvider: UnaryProvider,`
`56`	`56`	`private static RecordSetHeader BuildHeaderAndFilteredTupleDescriptor(`
`57`	`57`	`CompilableProvider source, IReadOnlyList<int> filteredColumns, string resultColumnName, out TupleDescriptor filteredTupleDescriptor)`
`58`	`58`	`{`
`59`		`- var header = source.Header.Add(new SystemColumn(resultColumnName, 0, WellKnownTypes.Bool));`
	`59`	`+ var header = source.Header.Add(new SystemColumn(resultColumnName, source.Header.Length, WellKnownTypes.Bool));`
`60`	`60`	`var columnCount = filteredColumns.Count;`
`61`	`61`	`var fieldTypes = new Type[columnCount];`
`62`	`62`	`for (var index = 0; index < columnCount; index++) {`