Added an option for a custom ProfiledDbDataReader implementation (MiniProfiler#325)

kekekeks · NickCraver · commit 022b6bdddf90 · 2018-09-16T06:22:30.000-04:00
* Added extension points for creating ProfiledDbCommand and ProfiledDbDataReader
diff --git a/src/MiniProfiler.Shared/Data/ProfiledDbCommand.cs b/src/MiniProfiler.Shared/Data/ProfiledDbCommand.cs
@@ -196,6 +196,12 @@ public override UpdateRowSource UpdatedRowSource
             set => _command.UpdatedRowSource = value;
         }
 
+        /// <summary>
+        /// Creates a wrapper data reader for <see cref="ExecuteDbDataReader"/> and <see cref="ExecuteDbDataReaderAsync"/> />
+        /// </summary>
+        protected virtual DbDataReader CreateDbDataReader(DbDataReader original, IDbProfiler profiler)
+            => new ProfiledDbDataReader(original, profiler);
+        
         /// <summary>
         /// Executes a database data reader.
         /// </summary>
@@ -213,7 +219,7 @@ protected override DbDataReader ExecuteDbDataReader(CommandBehavior behavior)
             try
             {
                 result = _command.ExecuteReader(behavior);
-                result = new ProfiledDbDataReader(result, _profiler);
+                result = CreateDbDataReader(result, _profiler);
             }
             catch (Exception e)
             {
@@ -246,7 +252,7 @@ protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBeha
             try
             {
                 result = await _command.ExecuteReaderAsync(behavior, cancellationToken).ConfigureAwait(false);
-                result = new ProfiledDbDataReader(result, _profiler);
+                result = CreateDbDataReader(result, _profiler);
             }
             catch (Exception e)
             {
diff --git a/src/MiniProfiler.Shared/Data/ProfiledDbConnection.cs b/src/MiniProfiler.Shared/Data/ProfiledDbConnection.cs
@@ -137,12 +137,19 @@ protected override DbTransaction BeginDbTransaction(IsolationLevel isolationLeve
         {
             return new ProfiledDbTransaction(_connection.BeginTransaction(isolationLevel), this);
         }
+        
+        /// <summary>
+        /// Creates and returns a <see cref="DbCommand"/> object associated with the current connection.
+        /// </summary>
+        /// <returns>A <see cref="ProfiledDbCommand"/> wrapping the created <see cref="DbCommand"/>.</returns>
+        protected virtual DbCommand CreateDbCommand(DbCommand original, IDbProfiler profiler)
+                => new ProfiledDbCommand(original, this, profiler);
 
         /// <summary>
         /// Creates and returns a <see cref="DbCommand"/> object associated with the current connection.
         /// </summary>
         /// <returns>A <see cref="ProfiledDbCommand"/> wrapping the created <see cref="DbCommand"/>.</returns>
-        protected override DbCommand CreateDbCommand() => new ProfiledDbCommand(_connection.CreateCommand(), this, _profiler);
+        protected override DbCommand CreateDbCommand() => CreateDbCommand(_connection.CreateCommand(), _profiler);
 
         /// <summary>
         /// Dispose the underlying connection.

Original file line number	Diff line number	Diff line change
`@@ -196,6 +196,12 @@ public override UpdateRowSource UpdatedRowSource`
`196`	`196`	`set => _command.UpdatedRowSource = value;`
`197`	`197`	`}`
`198`	`198`
	`199`	`+ /// <summary>`
	`200`	`+ /// Creates a wrapper data reader for <see cref="ExecuteDbDataReader"/> and <see cref="ExecuteDbDataReaderAsync"/> />`
	`201`	`+ /// </summary>`
	`202`	`+ protected virtual DbDataReader CreateDbDataReader(DbDataReader original, IDbProfiler profiler)`
	`203`	`+ => new ProfiledDbDataReader(original, profiler);`
	`204`	`+`
`199`	`205`	`/// <summary>`
`200`	`206`	`/// Executes a database data reader.`
`201`	`207`	`/// </summary>`
`@@ -213,7 +219,7 @@ protected override DbDataReader ExecuteDbDataReader(CommandBehavior behavior)`
`213`	`219`	`try`
`214`	`220`	`{`
`215`	`221`	`result = _command.ExecuteReader(behavior);`
`216`		`- result = new ProfiledDbDataReader(result, _profiler);`
	`222`	`+ result = CreateDbDataReader(result, _profiler);`
`217`	`223`	`}`
`218`	`224`	`catch (Exception e)`
`219`	`225`	`{`
`@@ -246,7 +252,7 @@ protected override async Task<DbDataReader> ExecuteDbDataReaderAsync(CommandBeha`
`246`	`252`	`try`
`247`	`253`	`{`
`248`	`254`	`result = await _command.ExecuteReaderAsync(behavior, cancellationToken).ConfigureAwait(false);`
`249`		`- result = new ProfiledDbDataReader(result, _profiler);`
	`255`	`+ result = CreateDbDataReader(result, _profiler);`
`250`	`256`	`}`
`251`	`257`	`catch (Exception e)`
`252`	`258`	`{`