Removed SqlClient dependency from SqlLogWriter class and added more unit tests.

Author: ckadluba

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/ISqlCommandWrapper.cs

@@ -1,15 +1,15 @@
 using System;
+using System.Collections.Generic;
 using System.Data;
-using System.Data.Common;
 
 namespace Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform
 {
     internal interface ISqlCommandWrapper : IDisposable
     {
         CommandType CommandType { get; set; }
-        DbParameterCollection Parameters { get; }
         string CommandText { get; set; }
 
+        void AddParameter(string parameterName, object value);
         int ExecuteNonQuery();
     }
 }

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlCommandWrapper.cs

@@ -1,4 +1,5 @@
 using System;
+using System.Collections.Generic;
 using System.Data;
 using System.Data.Common;
 #if NET452
@@ -25,14 +26,26 @@ public CommandType CommandType
             set => _sqlCommand.CommandType = value;
         }
 
-        public DbParameterCollection Parameters => _sqlCommand.Parameters;
-
         public string CommandText
         {
             get => _sqlCommand.CommandText;
             set => _sqlCommand.CommandText = value;
         }
 
+        public void AddParameter(string parameterName, object value)
+        {
+            var parameter = new SqlParameter(parameterName, value ?? DBNull.Value);
+
+            // The default is SqlDbType.DateTime, which will truncate the DateTime value if the actual
+            // type in the database table is datetime2. So we explicitly set it to DateTime2, which will
+            // work both if the field in the table is datetime and datetime2, which is also consistent with 
+            // the behavior of the non-audit sink.
+            if (value is DateTime)
+                parameter.SqlDbType = SqlDbType.DateTime2;
+
+            _sqlCommand.Parameters.Add(parameter);
+        }
+
         public int ExecuteNonQuery() =>
             _sqlCommand.ExecuteNonQuery();
 

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlLogEventWriter.cs

@@ -1,10 +1,5 @@
 using System;
 using System.Data;
-#if NET452
-using System.Data.SqlClient;
-#else
-using Microsoft.Data.SqlClient;
-#endif
 using System.Text;
 using Serilog.Debugging;
 using Serilog.Events;
@@ -58,16 +53,7 @@ public void WriteEvent(LogEvent logEvent)
                             parameterList.Append("@P");
                             parameterList.Append(index);
 
-                            var parameter = new SqlParameter($"@P{index}", field.Value ?? DBNull.Value);
-
-                            // The default is SqlDbType.DateTime, which will truncate the DateTime value if the actual
-                            // type in the database table is datetime2. So we explicitly set it to DateTime2, which will
-                            // work both if the field in the table is datetime and datetime2, which is also consistent with 
-                            // the behavior of the non-audit sink.
-                            if (field.Value is DateTime)
-                                parameter.SqlDbType = SqlDbType.DateTime2;
-
-                            command.Parameters.Add(parameter);
+                            command.AddParameter($"@P{index}", field.Value);
 
                             index++;
                         }

test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/SqlLogEventWriterTests.cs

@@ -122,19 +122,51 @@ public void WriteEventSetsSqlCommandWrapperCommandTypeText()
         }
 
         [Fact]
-        public void WriteEventSetsSqlCommandWrapperCommandTextToSqlInsertWithFields()
+        public void WriteEventCallsSqlCommandWrapperAddParameterForEachField()
         {
-            // TODO finish test
+            // Arrange
+            var logEvent = CreateLogEvent();
+            var field1Value = "FieldValue1";
+            var field2Value = 2;
+            var field3Value = new DateTimeOffset(2020, 1, 1, 0, 0, 0, TimeSpan.Zero);
+            var fieldsAndValues = new List<KeyValuePair<string, object>>
+            {
+                new KeyValuePair<string, object>("FieldName1", field1Value),
+                new KeyValuePair<string, object>("FieldName2", field2Value),
+                new KeyValuePair<string, object>("FieldNameThree", field3Value)
+            };
+            _logEventDataGeneratorMock.Setup(d => d.GetColumnsAndValues(It.IsAny<LogEvent>()))
+                .Returns(fieldsAndValues);
+
+            // Act
+            _sut.WriteEvent(logEvent);
 
+            // Assert
+            _sqlCommandWrapperMock.Verify(c => c.AddParameter("@P0", field1Value), Times.Once);
+            _sqlCommandWrapperMock.Verify(c => c.AddParameter("@P1", field2Value), Times.Once);
+            _sqlCommandWrapperMock.Verify(c => c.AddParameter("@P2", field3Value), Times.Once);
+        }
+
+        [Fact]
+        public void WriteEventSetsSqlCommandWrapperCommandTextToSqlInsertWithCorrectFieldsAndValues()
+        {
             // Arrange
+            var expectedSqlCommandText = $"INSERT INTO [{_schemaName}].[{_tableName}] (FieldName1,FieldName2,FieldNameThree) VALUES (@P0,@P1,@P2)";
             var logEvent = CreateLogEvent();
-            //_logEventDataGeneratorMock.Setup(...)
+            var fieldsAndValues = new List<KeyValuePair<string, object>>
+            {
+                new KeyValuePair<string, object>("FieldName1", "FieldValue1"),
+                new KeyValuePair<string, object>("FieldName2", 2),
+                new KeyValuePair<string, object>("FieldNameThree", new DateTimeOffset(2020, 1, 1, 0, 0, 0, TimeSpan.Zero))
+            };
+            _logEventDataGeneratorMock.Setup(d => d.GetColumnsAndValues(It.IsAny<LogEvent>()))
+                .Returns(fieldsAndValues);
 
             // Act
             _sut.WriteEvent(logEvent);
 
             // Assert
-            //_sqlCommandWrapperMock.VerifySet(c => c.CommandText = expectedCommandText);
+            _sqlCommandWrapperMock.VerifySet(c => c.CommandText = expectedSqlCommandText);
         }
 
         [Fact]