Add leaveOpen constructor parameter to the CsvDataReader class

src/CsvHelper/CsvDataReader.cs

@@ -14,9 +14,11 @@ namespace CsvHelper
 	/// <seealso cref="System.Data.IDataReader" />
 	public class CsvDataReader : IDataReader
 	{
+		private readonly bool leaveOpen;
 		private readonly CsvReader csv;
 		private readonly DataTable schemaTable;
 		private bool skipNextRead;
+		private bool disposed;
 
 		/// <inheritdoc />
 		public object this[int i]
@@ -36,6 +38,9 @@ public object this[string name]
 			}
 		}
 
+		/// <inheritdoc />
+		public bool IsClosed => disposed;
+
 		/// <inheritdoc />
 		public int Depth
 		{
@@ -45,9 +50,6 @@ public int Depth
 			}
 		}
 
-		/// <inheritdoc />
-		public bool IsClosed { get; private set; }
-
 		/// <inheritdoc />
 		public int RecordsAffected
 		{
@@ -71,9 +73,11 @@ public int FieldCount
 		/// </summary>
 		/// <param name="csv">The CSV.</param>
 		/// <param name="schemaTable">The DataTable representing the file schema.</param>
-		public CsvDataReader(CsvReader csv, DataTable schemaTable = null)
+		/// <param name="leaveOpen"><c>true</c> to leave the <see cref="CsvReader"/> open after the <see cref="CsvDataReader"/> object is disposed, otherwise <c>false</c>.</param>
+		public CsvDataReader(CsvReader csv, DataTable schemaTable = null, bool leaveOpen = false)
 		{
 			this.csv = csv;
+			this.leaveOpen = leaveOpen;
 
 			csv.Read();
 
@@ -95,11 +99,33 @@ public void Close()
 			Dispose();
 		}
 
-		/// <inheritdoc />
+		/// <inheritdoc/>
 		public void Dispose()
 		{
-			csv.Dispose();
-			IsClosed = true;
+			Dispose(disposing: true);
+			GC.SuppressFinalize(this);
+		}
+
+		/// <summary>
+		/// Disposes the object.
+		/// </summary>
+		/// <param name="disposing">Indicates if the object is being disposed.</param>
+		protected virtual void Dispose(bool disposing)
+		{
+			if (disposed)
+			{
+				return;
+			}
+
+			if (disposing)
+			{
+				if (!leaveOpen)
+				{
+					csv?.Dispose();
+				}
+			}
+
+			disposed = true;
 		}
 
 		/// <inheritdoc />

tests/CsvHelper.Tests/CsvDataReaderDisposalTests.cs

@@ -0,0 +1,48 @@
+using System.Globalization;
+using System.IO;
+using System.Text;
+using Xunit;
+
+namespace CsvHelper.Tests
+{
+	public class CsvDataReaderDisposalTests
+	{
+		[Fact]
+		public void ShouldNotDisposeCsvReaderWhenLeaveOpenParameterIsTrue()
+		{
+			var s = new StringBuilder();
+			s.AppendLine("StringColumn");
+			s.AppendLine("one");
+			using (var reader = new StringReader(s.ToString()))
+			using (var csv = new CsvReader(reader, CultureInfo.InvariantCulture))
+			{
+				var dataReader = new CsvDataReader(csv, leaveOpen: true);
+				dataReader.Dispose();
+
+				var record = csv.GetRecord<TestRecord>();
+				Assert.NotNull(record);
+			}
+		}
+
+		[Fact]
+		public void DisposeShouldSetIsClosed()
+		{
+			var s = new StringBuilder();
+			s.AppendLine("StringColumn");
+			s.AppendLine("one");
+			using (var reader = new StringReader(s.ToString()))
+			using (var csv = new CsvReader(reader, CultureInfo.InvariantCulture))
+			{
+				var dataReader = new CsvDataReader(csv, leaveOpen: true);
+				dataReader.Dispose();
+
+				Assert.True(dataReader.IsClosed);
+			}
+		}
+
+		private class TestRecord()
+		{
+			public string StringColumn { get; set; }
+		}
+	}
+}