Merge pull request #332 from susanneschuster/dev

ckadluba · web-flow · commit 238883022ad4 · 2020-11-25T16:20:47.000+01:00
added support for reserved columns
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlLogEventWriter.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlLogEventWriter.cs
@@ -49,7 +49,7 @@ public void WriteEvent(LogEvent logEvent)
                                 parameterList.Append(',');
                             }
 
-                            fieldList.Append(field.Key);
+                            fieldList.Append($"[{field.Key}]");
                             parameterList.Append("@P");
                             parameterList.Append(index);
 
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/SqlLogEventWriterTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/SqlLogEventWriterTests.cs
@@ -139,7 +139,7 @@ public void WriteEventCallsSqlCommandWrapperAddParameterForEachField()
         public void WriteEventSetsSqlCommandWrapperCommandTextToSqlInsertWithCorrectFieldsAndValues()
         {
             // Arrange
-            var expectedSqlCommandText = $"INSERT INTO [{_schemaName}].[{_tableName}] (FieldName1,FieldName2,FieldNameThree) VALUES (@P0,@P1,@P2)";
+            var expectedSqlCommandText = $"INSERT INTO [{_schemaName}].[{_tableName}] ([FieldName1],[FieldName2],[FieldNameThree]) VALUES (@P0,@P1,@P2)";
             var logEvent = TestLogEventHelper.CreateLogEvent();
             var fieldsAndValues = new List<KeyValuePair<string, object>>
             {

Original file line number	Diff line number	Diff line change
`@@ -49,7 +49,7 @@ public void WriteEvent(LogEvent logEvent)`
`49`	`49`	`parameterList.Append(',');`
`50`	`50`	`}`
`51`	`51`
`52`		`- fieldList.Append(field.Key);`
	`52`	`+ fieldList.Append($"[{field.Key}]");`
`53`	`53`	`parameterList.Append("@P");`
`54`	`54`	`parameterList.Append(index);`
`55`	`55`
Original file line number	Diff line number	Diff line change
`@@ -139,7 +139,7 @@ public void WriteEventCallsSqlCommandWrapperAddParameterForEachField()`
`139`	`139`	`public void WriteEventSetsSqlCommandWrapperCommandTextToSqlInsertWithCorrectFieldsAndValues()`
`140`	`140`	`{`
`141`	`141`	`// Arrange`
`142`		`- var expectedSqlCommandText = $"INSERT INTO [{_schemaName}].[{_tableName}] (FieldName1,FieldName2,FieldNameThree) VALUES (@P0,@P1,@P2)";`
	`142`	`+ var expectedSqlCommandText = $"INSERT INTO [{_schemaName}].[{_tableName}] ([FieldName1],[FieldName2],[FieldNameThree]) VALUES (@P0,@P1,@P2)";`
`143`	`143`	`var logEvent = TestLogEventHelper.CreateLogEvent();`
`144`	`144`	`var fieldsAndValues = new List<KeyValuePair<string, object>>`
`145`	`145`	`{`