Complete port of PR521 to netfx (#2964)

edwardneal · MichelZ · commit 4f423452a904 · 2024-11-26T06:29:29.000+01:00
diff --git a/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDataReader.cs b/src/Microsoft.Data.SqlClient/netfx/src/Microsoft/Data/SqlClient/SqlDataReader.cs
@@ -3043,7 +3043,7 @@ virtual public int GetSqlValues(object[] values)
 
                 for (int i = 0; i < copyLen; i++)
                 {
-                    values[_metaData.GetVisibleColumnIndex(i)] = GetSqlValueInternal(i);
+                    values[i] = GetSqlValueInternal(_metaData.GetVisibleColumnIndex(i));
                 }
                 return copyLen;
             }
@@ -3487,7 +3487,7 @@ override public int GetValues(object[] values)
                     // If this is sequential access, then we need to wipe the internal buffer
                     if ((sequentialAccess) && (i < maximumColumn))
                     {
-                        _data[i].Clear();
+                        _data[fieldIndex].Clear();
                         if (fieldIndex > i && fieldIndex > 0)
                         {
                             // if we jumped an index forward because of a hidden column see if the buffer before the

Original file line number	Diff line number	Diff line change
`@@ -3043,7 +3043,7 @@ virtual public int GetSqlValues(object[] values)`
`3043`	`3043`
`3044`	`3044`	`for (int i = 0; i < copyLen; i++)`
`3045`	`3045`	`{`
`3046`		`- values[_metaData.GetVisibleColumnIndex(i)] = GetSqlValueInternal(i);`
	`3046`	`+ values[i] = GetSqlValueInternal(_metaData.GetVisibleColumnIndex(i));`
`3047`	`3047`	`}`
`3048`	`3048`	`return copyLen;`
`3049`	`3049`	`}`
`@@ -3487,7 +3487,7 @@ override public int GetValues(object[] values)`
`3487`	`3487`	`// If this is sequential access, then we need to wipe the internal buffer`
`3488`	`3488`	`if ((sequentialAccess) && (i < maximumColumn))`
`3489`	`3489`	`{`
`3490`		`- _data[i].Clear();`
	`3490`	`+ _data[fieldIndex].Clear();`
`3491`	`3491`	`if (fieldIndex > i && fieldIndex > 0)`
`3492`	`3492`	`{`
`3493`	`3493`	`// if we jumped an index forward because of a hidden column see if the buffer before the`