Merge pull request #356 from serilog/dev

Release 5.6.1

Author: ckadluba

CHANGES.md

@@ -1,3 +1,7 @@
+# 5.6.1
+* Added support for reserved columns (thanks to @susanneschuster).
+* Fixes in README.
+
 # 5.6.0
 * Fixed issue #191: Added option `EagerlyEmitFirstEvent` by implementing new PeriodicBatchingSink API.
 * Replaced `SinkOptions` with `MSSqlServerSinkOptions` and cleaned up namespaced (thanks to @jonorossi for the contribution).

README.md

@@ -486,7 +486,7 @@ This column stores log event property values as JSON. Typically you will use eit
 
 The `ExcludeAddtionalProperties` and `ExcludeStandardColumns` properties are described in the [Custom Property Columns](#custom-property-columns) topic.
 
-The content of this column is rendered as JSON by default or with a custom ITextFormatter passed by the caller as parameter `logEventFormatter`. Details can be found in [Sink Configuration Options](#sink-configuration-options).
+The content of this column is rendered as JSON by default or with a custom ITextFormatter passed by the caller as parameter `logEventFormatter`. Details can be found in [Sink Configuration](#sink-configuration).
 
 ## Custom Property Columns
 
@@ -742,7 +742,7 @@ This capability requires SQL 2012 or newer. Given the following JSON properties:
 {
   "Properties": {
     "Action": "GetUsers",
-    "Controller": "UserControler"
+    "Controller": "UserController"
   }
 }
 ```

appveyor.yml

@@ -13,7 +13,7 @@ artifacts:
 deploy:
   - provider: NuGet
     api_key:
-      secure: K3/810hkTO6rd2AEHVkUQAadjGmDREus9k96QHu6hxrA1/wRTuAJemHMKtVVgIvf
+      secure: zrzY5fJna3SCz64TYww+rcE4X1u9bDhDFBOztM0XJkqbPS4FBkwv5mCZO5L1ebBx
     on:
       branch: /^(master|dev)$/
   - provider: GitHub

src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj

@@ -2,7 +2,7 @@
 
   <PropertyGroup>
     <Description>A Serilog sink that writes events to Microsoft SQL Server</Description>
-    <VersionPrefix>5.6.0</VersionPrefix>
+    <VersionPrefix>5.6.1</VersionPrefix>
     <Authors>Michiel van Oudheusden;Christian Kadluba;Serilog Contributors</Authors>
     <TargetFrameworks>netstandard2.0;net452;net461;net472;netcoreapp2.0;netcoreapp2.1</TargetFrameworks>
     <TreatWarningsAsErrors>true</TreatWarningsAsErrors>

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);
 

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>>
             {