Merge pull request #313 from ckadluba/issue-312-conversion-fail

Fixed issue 312

Author: ckadluba

appveyor.yml

@@ -5,23 +5,23 @@ configuration: Release
 install:
   - ps: mkdir -Force ".\build\" | Out-Null
 build_script:
-- ps: ./Build.ps1
+  - ps: ./Build.ps1
 test: off
 artifacts:
-- path: artifacts/Serilog.*.nupkg
-- path: artifacts/Serilog.*.snupkg
+  - path: artifacts/Serilog.*.nupkg
+  - path: artifacts/Serilog.*.snupkg
 deploy:
-- provider: NuGet
-  api_key:
-    secure: K3/810hkTO6rd2AEHVkUQAadjGmDREus9k96QHu6hxrA1/wRTuAJemHMKtVVgIvf
-  on:
-    branch: /^(master|dev)$/
-- provider: GitHub
-  auth_token:
-    secure: p4LpVhBKxGS5WqucHxFQ5c7C8cP74kbNB0Z8k9Oxx/PMaDQ1+ibmoexNqVU5ZlmX
-  artifacts:
-    /Serilog.*\.nupkg/
-    /Serilog.*\.snupkg/
-  tag: v$(appveyor_build_version)
-  on:
-    branch: master
+  - provider: NuGet
+    api_key:
+      secure: K3/810hkTO6rd2AEHVkUQAadjGmDREus9k96QHu6hxrA1/wRTuAJemHMKtVVgIvf
+    on:
+      branch: /^(master|dev)$/
+  - provider: GitHub
+    auth_token:
+      secure: p4LpVhBKxGS5WqucHxFQ5c7C8cP74kbNB0Z8k9Oxx/PMaDQ1+ibmoexNqVU5ZlmX
+    artifacts:
+      /Serilog.*\.nupkg/
+      /Serilog.*\.snupkg/
+    tag: v$(appveyor_build_version)
+    on:
+      branch: master

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Output/PropertiesColumnDataGenerator.cs

@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Globalization;
 using System.Linq;
 using Serilog.Events;
@@ -49,6 +50,12 @@ public IEnumerable<KeyValuePair<string, object>> ConvertPropertiesToColumn(IRead
                     continue;
                 }
 
+                if (columnType.IsAssignableFrom(scalarValue.Value.GetType()))
+                {
+                    yield return new KeyValuePair<string, object>(columnName, scalarValue.Value);
+                    continue;
+                }
+
                 if (TryChangeType(scalarValue.Value, columnType, out var conversion))
                 {
                     yield return new KeyValuePair<string, object>(columnName, conversion);
@@ -65,7 +72,7 @@ private static bool TryChangeType(object obj, Type type, out object conversion)
             conversion = null;
             try
             {
-                conversion = Convert.ChangeType(obj, type, CultureInfo.InvariantCulture);
+                conversion = TypeDescriptor.GetConverter(type).ConvertFrom(obj);
                 return true;
             }
             catch

test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Output/PropertiesColumnDataGeneratorTests.cs

@@ -137,6 +137,30 @@ public void ConvertPropertiesToColumnConvertsValueTypeToStringIfConversionToColu
             Assert.Equal("1", result[0].Value);
         }
 
+        [Fact]
+        public void ConvertPropertiesToColumnConvertsUniqueIdentifier()
+        {
+            // Arrange
+            const string propertyKey = "AdditionalProperty1";
+            const string propertyValue = "7526f485-ec2d-4ec8-bd73-12a7d1c49a5d";
+            var properties = new ReadOnlyDictionary<string, LogEventPropertyValue>(
+                new Dictionary<string, LogEventPropertyValue>
+                {
+                    { propertyKey, new ScalarValue(propertyValue) }
+                });
+            _columnOptions.AdditionalColumns.Add(new SqlColumn(propertyKey, SqlDbType.UniqueIdentifier));
+            CreateSut();
+
+            // Act
+            var result = _sut.ConvertPropertiesToColumn(properties).ToArray();
+
+            // Assert
+            var expectedResult = Guid.Parse(propertyValue);
+            Assert.Equal(propertyKey, result[0].Key);
+            Assert.IsType<Guid>(result[0].Value);
+            Assert.Equal(expectedResult, result[0].Value);
+        }
+
         private void CreateSut()
         {
             _sut = new PropertiesColumnDataGenerator(_columnOptions);