Merge pull request #285 from ckadluba/refactor-SinkTraits

ckadluba · web-flow · commit ade8a76415e1 · 2020-05-13T11:28:30.000+02:00
Unit tests for PropertiesColumnDataGenerator
diff --git a/sample/AppConfigDemo/App.config b/sample/AppConfigDemo/App.config
@@ -28,7 +28,7 @@
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="Microsoft.Extensions.Primitives" publicKeyToken="adb9793829ddae60" culture="neutral" />
-        <bindingRedirect oldVersion="0.0.0.0-3.1.3.0" newVersion="3.1.3.0" />
+        <bindingRedirect oldVersion="0.0.0.0-3.1.4.0" newVersion="3.1.4.0" />
       </dependentAssembly>
       <dependentAssembly>
         <assemblyIdentity name="System.Memory" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
diff --git a/sample/AppConfigDemo/AppConfigDemo.csproj b/sample/AppConfigDemo/AppConfigDemo.csproj
@@ -33,11 +33,11 @@
     <WarningLevel>4</WarningLevel>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.3\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Configuration.Abstractions, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Configuration.Abstractions.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Configuration.Abstractions.dll</HintPath>
     </Reference>
-    <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.3.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\Microsoft.Extensions.Primitives.3.1.3\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
+    <Reference Include="Microsoft.Extensions.Primitives, Version=3.1.4.0, Culture=neutral, PublicKeyToken=adb9793829ddae60, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\Microsoft.Extensions.Primitives.3.1.4\lib\netstandard2.0\Microsoft.Extensions.Primitives.dll</HintPath>
     </Reference>
     <Reference Include="Serilog, Version=2.0.0.0, Culture=neutral, PublicKeyToken=24c2f752a8e58a10, processorArchitecture=MSIL">
       <HintPath>..\..\packages\Serilog.2.9.0\lib\net46\Serilog.dll</HintPath>
diff --git a/sample/AppConfigDemo/packages.config b/sample/AppConfigDemo/packages.config
@@ -1,7 +1,7 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="Microsoft.Extensions.Configuration.Abstractions" version="3.1.3" targetFramework="net461" />
-  <package id="Microsoft.Extensions.Primitives" version="3.1.3" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Configuration.Abstractions" version="3.1.4" targetFramework="net461" />
+  <package id="Microsoft.Extensions.Primitives" version="3.1.4" targetFramework="net461" />
   <package id="Serilog" version="2.9.0" targetFramework="net461" />
   <package id="Serilog.Settings.AppSettings" version="2.2.2" targetFramework="net461" />
   <package id="System.Buffers" version="4.5.1" targetFramework="net461" />
diff --git a/sample/CombinedConfigDemo/CombinedConfigDemo.csproj b/sample/CombinedConfigDemo/CombinedConfigDemo.csproj
@@ -12,7 +12,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="3.1.4" />
   </ItemGroup>
 
   <ItemGroup>
diff --git a/sample/WorkerServiceDemo/WorkerServiceDemo.csproj b/sample/WorkerServiceDemo/WorkerServiceDemo.csproj
@@ -6,7 +6,7 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.3" />
+    <PackageReference Include="Microsoft.Extensions.Hosting" Version="3.1.4" />
     <PackageReference Include="Serilog.Extensions.Hosting" Version="3.0.0" />
     <PackageReference Include="Serilog.Settings.Configuration" Version="3.1.0" />
   </ItemGroup>
diff --git a/src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/Microsoft.Extensions.Configuration/MicrosoftExtensionsColumnOptionsProvider.cs b/src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/Microsoft.Extensions.Configuration/MicrosoftExtensionsColumnOptionsProvider.cs
@@ -35,7 +35,7 @@ private static void SetCommonColumnOptions(IConfigurationSection section, SqlCol
             SetProperty.IfNotNull<bool>(section["nonClusteredIndex"], (val) => target.NonClusteredIndex = val);
         }
 
-        private void AddRemoveStandardColumns(IConfigurationSection config, ColumnOptions columnOptions)
+        private static void AddRemoveStandardColumns(IConfigurationSection config, ColumnOptions columnOptions)
         {
             // add standard columns
             var addStd = config.GetSection("addStandardColumns");
@@ -62,7 +62,7 @@ private void AddRemoveStandardColumns(IConfigurationSection config, ColumnOption
             }
         }
 
-        private void AddAdditionalColumns(IConfigurationSection config, ColumnOptions columnOptions)
+        private static void AddAdditionalColumns(IConfigurationSection config, ColumnOptions columnOptions)
         {
             var newcols =
                 config.GetSection("additionalColumns").Get<List<SqlColumn>>()
@@ -83,7 +83,7 @@ private void AddAdditionalColumns(IConfigurationSection config, ColumnOptions co
             }
         }
 
-        private void ReadStandardColumns(IConfigurationSection config, ColumnOptions columnOptions)
+        private static void ReadStandardColumns(IConfigurationSection config, ColumnOptions columnOptions)
         {
             var section = config.GetSection("id");
             if (section != null)
@@ -148,7 +148,7 @@ private void ReadStandardColumns(IConfigurationSection config, ColumnOptions col
                 SetCommonColumnOptions(section, columnOptions.MessageTemplate);
         }
 
-        private void ReadMiscColumnOptions(IConfigurationSection config, ColumnOptions columnOptions)
+        private static void ReadMiscColumnOptions(IConfigurationSection config, ColumnOptions columnOptions)
         {
             SetProperty.IfNotNull<bool>(config["disableTriggers"], (val) => columnOptions.DisableTriggers = val);
             SetProperty.IfNotNull<bool>(config["clusteredColumnstoreIndex"], (val) => columnOptions.ClusteredColumnstoreIndex = val);
diff --git a/src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/Microsoft.Extensions.Configuration/MicrosoftExtensionsSinkOptionsProvider.cs b/src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/Microsoft.Extensions.Configuration/MicrosoftExtensionsSinkOptionsProvider.cs
@@ -21,20 +21,20 @@ public SinkOptions ConfigureSinkOptions(SinkOptions sinkOptions, IConfigurationS
             return sinkOptions;
         }
 
-        private void ReadTableOptions(IConfigurationSection config, SinkOptions sinkOptions)
+        private static void ReadTableOptions(IConfigurationSection config, SinkOptions sinkOptions)
         {
             SetProperty.IfNotNull<string>(config["tableName"], val => sinkOptions.TableName = val);
             SetProperty.IfNotNull<string>(config["schemaName"], val => sinkOptions.SchemaName = val);
             SetProperty.IfNotNull<bool>(config["autoCreateSqlTable"], val => sinkOptions.AutoCreateSqlTable = val);
         }
 
-        private void ReadBatchSettings(IConfigurationSection config, SinkOptions sinkOptions)
+        private static void ReadBatchSettings(IConfigurationSection config, SinkOptions sinkOptions)
         {
             SetProperty.IfNotNull<int>(config["batchPostingLimit"], val => sinkOptions.BatchPostingLimit = val);
             SetProperty.IfNotNull<string>(config["batchPeriod"], val => sinkOptions.BatchPeriod = TimeSpan.Parse(val, CultureInfo.InvariantCulture));
         }
 
-        private void ReadAzureManagedIdentitiesOptions(IConfigurationSection config, SinkOptions sinkOptions)
+        private static void ReadAzureManagedIdentitiesOptions(IConfigurationSection config, SinkOptions sinkOptions)
         {
             SetProperty.IfNotNull<bool>(config["useAzureManagedIdentity"], val => sinkOptions.UseAzureManagedIdentity = val);
             SetProperty.IfNotNull<string>(config["azureServiceTokenProviderResource"], val => sinkOptions.AzureServiceTokenProviderResource = val);
diff --git a/src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/System.Configuration/SystemConfigurationColumnOptionsProvider.cs b/src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/System.Configuration/SystemConfigurationColumnOptionsProvider.cs
@@ -10,7 +10,7 @@ public ColumnOptions ConfigureColumnOptions(MSSqlServerConfigurationSection conf
         {
             columnOptions = columnOptions ?? new ColumnOptions();
 
-            AddRmoveStandardColumns(config, columnOptions);
+            AddRemoveStandardColumns(config, columnOptions);
             AddAdditionalColumns(config, columnOptions);
             ReadStandardColumns(config, columnOptions);
             ReadMiscColumnOptions(config, columnOptions);
@@ -55,7 +55,7 @@ private static void ReadPropertiesColumnOptions(MSSqlServerConfigurationSection
                 value => columnOptions.Properties.UsePropertyKeyAsElementName = value);
         }
 
-        private void AddRmoveStandardColumns(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)
+        private static void AddRemoveStandardColumns(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)
         {
             // add standard columns
             if (config.AddStandardColumns.Count > 0)
@@ -80,7 +80,7 @@ private void AddRmoveStandardColumns(MSSqlServerConfigurationSection config, Col
             }
         }
 
-        private void AddAdditionalColumns(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)
+        private static void AddAdditionalColumns(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)
         {
             if (config.Columns.Count > 0)
             {
@@ -98,7 +98,7 @@ private void AddAdditionalColumns(MSSqlServerConfigurationSection config, Column
             }
         }
 
-        private void ReadStandardColumns(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)
+        private static void ReadStandardColumns(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)
         {
             SetCommonColumnOptions(config.Exception, columnOptions.Exception);
             SetCommonColumnOptions(config.Id, columnOptions.Id);
@@ -123,7 +123,7 @@ private void ReadStandardColumns(MSSqlServerConfigurationSection config, ColumnO
                 value => columnOptions.TimeStamp.ConvertToUtc = value);
         }
 
-        private void ReadMiscColumnOptions(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)
+        private static void ReadMiscColumnOptions(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)
         {
             SetProperty.IfProvided<bool>(config, nameof(columnOptions.DisableTriggers), value => columnOptions.DisableTriggers = value);
             SetProperty.IfProvided<bool>(config, nameof(columnOptions.ClusteredColumnstoreIndex), value => columnOptions.ClusteredColumnstoreIndex = value);
diff --git a/src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/System.Configuration/SystemConfigurationSinkOptionsProvider.cs b/src/Serilog.Sinks.MSSqlServer/Configuration/Implementations/System.Configuration/SystemConfigurationSinkOptionsProvider.cs
@@ -16,21 +16,21 @@ public SinkOptions ConfigureSinkOptions(MSSqlServerConfigurationSection config,
             return sinkOptions;
         }
 
-        private void ReadTableOptions(MSSqlServerConfigurationSection config, SinkOptions sinkOptions)
+        private static void ReadTableOptions(MSSqlServerConfigurationSection config, SinkOptions sinkOptions)
         {
             SetProperty.IfProvided<string>(config.TableName, nameof(config.TableName.Value), value => sinkOptions.TableName = value);
             SetProperty.IfProvided<string>(config.SchemaName, nameof(config.SchemaName.Value), value => sinkOptions.SchemaName = value);
             SetProperty.IfProvided<bool>(config.AutoCreateSqlTable, nameof(config.AutoCreateSqlTable.Value),
                 value => sinkOptions.AutoCreateSqlTable = value);
         }
 
-        private void ReadBatchSettings(MSSqlServerConfigurationSection config, SinkOptions sinkOptions)
+        private static void ReadBatchSettings(MSSqlServerConfigurationSection config, SinkOptions sinkOptions)
         {
             SetProperty.IfProvided<int>(config.BatchPostingLimit, nameof(config.BatchPostingLimit.Value), val => sinkOptions.BatchPostingLimit = val);
             SetProperty.IfProvided<string>(config.BatchPeriod, nameof(config.BatchPeriod.Value), val => sinkOptions.BatchPeriod = TimeSpan.Parse(val, CultureInfo.InvariantCulture));
         }
 
-        private void ReadAzureManagedIdentitiesOptions(MSSqlServerConfigurationSection config, SinkOptions sinkOptions)
+        private static void ReadAzureManagedIdentitiesOptions(MSSqlServerConfigurationSection config, SinkOptions sinkOptions)
         {
             SetProperty.IfProvided<bool>(config.UseAzureManagedIdentity, nameof(config.UseAzureManagedIdentity.Value),
                 value => sinkOptions.UseAzureManagedIdentity = value);
diff --git a/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj b/src/Serilog.Sinks.MSSqlServer/Serilog.Sinks.MSSqlServer.csproj
@@ -26,7 +26,7 @@
 
   <ItemGroup>
     <!-- Whenever these are updated, also update versions in packages.config for net452 -->
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
diff --git a/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlCreateTableWriter.cs b/src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/SqlCreateTableWriter.cs
@@ -64,7 +64,7 @@ public string GetSqlFromDataTable(string schemaName, string tableName, DataTable
         // Examples of possible output:
         // [Id] BIGINT IDENTITY(1,1) NOT NULL
         // [Message] VARCHAR(1024) NULL
-        private string GetColumnDDL(SqlColumn column)
+        private static string GetColumnDDL(SqlColumn column)
         {
             var sb = new StringBuilder();
 
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/Configuration/Extensions/Hybrid/ConfigurationExtensionsTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/Configuration/Extensions/Hybrid/ConfigurationExtensionsTests.cs
@@ -142,7 +142,7 @@ public void SinkOptionsFromConfigSection()
             VerifyDatabaseColumnsWereCreated(standardNames);
         }
 
-        private IConfiguration TestConfiguration() =>
+        private static IConfiguration TestConfiguration() =>
             new ConfigurationBuilder()
                 .AddInMemoryCollection(new Dictionary<string, string>
                 {
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/Serilog.Sinks.MSSqlServer.Tests.csproj b/test/Serilog.Sinks.MSSqlServer.Tests/Serilog.Sinks.MSSqlServer.Tests.csproj
@@ -17,12 +17,12 @@
     <PackageReference Include="FluentAssertions" Version="5.10.3" />
     <PackageReference Include="Dapper.StrongName" Version="1.50.5" />
     <DotNetCliToolReference Include="dotnet-xunit" Version="2.3.0" />
-    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="2.9.8">
+    <PackageReference Include="Microsoft.CodeAnalysis.FxCopAnalyzers" Version="3.0.0">
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.9.2" />
-    <PackageReference Include="Moq" Version="4.13.1" />
+    <PackageReference Include="Moq" Version="4.14.1" />
     <PackageReference Include="System.Diagnostics.Debug" Version="4.3.0" />
   </ItemGroup>
 
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Output/PropertiesColumnDataGeneratorTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Output/PropertiesColumnDataGeneratorTests.cs
@@ -0,0 +1,145 @@
+﻿using System;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Data;
+using System.Linq;
+using Serilog.Events;
+using Serilog.Sinks.MSSqlServer.Output;
+using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
+using Xunit;
+
+namespace Serilog.Sinks.MSSqlServer.Tests.Sinks.MSSqlServer.Output
+{
+    [Trait(TestCategory.TraitName, TestCategory.Unit)]
+    public class PropertiesColumnDataGeneratorTests
+    {
+        private readonly Serilog.Sinks.MSSqlServer.ColumnOptions _columnOptions;
+        private PropertiesColumnDataGenerator _sut;
+
+        public PropertiesColumnDataGeneratorTests()
+        {
+            _columnOptions = new Serilog.Sinks.MSSqlServer.ColumnOptions
+            {
+                AdditionalColumns = new List<SqlColumn>()
+            };
+        }
+
+        [Fact]
+        public void ConvertPropertiesToColumnReturnsKeyValueForAdditionalColumnProperty()
+        {
+            // Arrange
+            const string propertyKey = "AdditionalProperty1";
+            const string propertyValue = "Additonal Property Value";
+            var properties = new ReadOnlyDictionary<string, LogEventPropertyValue>(
+                new Dictionary<string, LogEventPropertyValue>
+                {
+                    { propertyKey, new ScalarValue(propertyValue) }
+                });
+            _columnOptions.AdditionalColumns.Add(new SqlColumn(propertyKey, SqlDbType.NVarChar));
+            CreateSut();
+
+            // Act
+            var result = _sut.ConvertPropertiesToColumn(properties).ToArray();
+
+            // Assert
+            Assert.Single(result);
+            Assert.Equal(propertyKey, result[0].Key);
+            Assert.Equal(propertyValue, result[0].Value);
+        }
+
+        [Fact]
+        public void ConvertPropertiesToColumnIgnoresPropertiesNamedLikeStandardColumns()
+        {
+            // Arrange
+            var properties = new ReadOnlyDictionary<string, LogEventPropertyValue>(
+                new Dictionary<string, LogEventPropertyValue>
+                {
+                    { StandardColumn.Id.ToString(), new ScalarValue(1) },
+                    { StandardColumn.Message.ToString(), new ScalarValue("Message") },
+                    { StandardColumn.MessageTemplate.ToString(), new ScalarValue("MessageTemplate") },
+                    { StandardColumn.Level.ToString(), new ScalarValue(1) },
+                    { StandardColumn.TimeStamp.ToString(), new ScalarValue(new DateTimeOffset(2020, 1, 1, 0, 0, 0, TimeSpan.Zero)) },
+                    { StandardColumn.Exception.ToString(), new ScalarValue("Exception") },
+                    { StandardColumn.Properties.ToString(), new ScalarValue("Properties") },
+                    { StandardColumn.LogEvent.ToString(), new ScalarValue("LogEvent") },
+                });
+            CreateSut();
+
+            // Act
+            var result = _sut.ConvertPropertiesToColumn(properties).ToArray();
+
+            // Assert
+            Assert.Empty(result);
+        }
+
+        [Fact]
+        public void ConvertPropertiesToColumnReturnsDbNullValueForAllowNullColumnProperty()
+        {
+            // Arrange
+            const string propertyKey = "AdditionalProperty1";
+            var properties = new ReadOnlyDictionary<string, LogEventPropertyValue>(
+                new Dictionary<string, LogEventPropertyValue>
+                {
+                    { propertyKey, new ScalarValue(null) }
+                });
+            _columnOptions.AdditionalColumns.Add(new SqlColumn(propertyKey, SqlDbType.NVarChar, allowNull: true));
+            CreateSut();
+
+            // Act
+            var result = _sut.ConvertPropertiesToColumn(properties).ToArray();
+
+            // Assert
+            Assert.Equal(propertyKey, result[0].Key);
+            Assert.Equal(DBNull.Value, result[0].Value);
+        }
+
+        [Fact]
+        public void ConvertPropertiesToColumnConvertsValueType()
+        {
+            // Arrange
+            const string propertyKey = "AdditionalProperty1";
+            const string propertyValue = "Additonal Property Value";
+            var properties = new ReadOnlyDictionary<string, LogEventPropertyValue>(
+                new Dictionary<string, LogEventPropertyValue>
+                {
+                    { propertyKey, new ScalarValue(propertyValue) }
+                });
+            _columnOptions.AdditionalColumns.Add(new SqlColumn(propertyKey, SqlDbType.NVarChar));
+            CreateSut();
+
+            // Act
+            var result = _sut.ConvertPropertiesToColumn(properties).ToArray();
+
+            // Assert
+            Assert.Equal(propertyKey, result[0].Key);
+            Assert.Equal(propertyValue, result[0].Value);
+        }
+
+        [Fact]
+        public void ConvertPropertiesToColumnConvertsValueTypeToStringIfConversionToColumnTypeFails()
+        {
+            // Arrange
+            const string propertyKey = "AdditionalProperty1";
+            var properties = new ReadOnlyDictionary<string, LogEventPropertyValue>(
+                new Dictionary<string, LogEventPropertyValue>
+                {
+                    { propertyKey, new ScalarValue(1) }
+                });
+            _columnOptions.AdditionalColumns.Add(new SqlColumn(propertyKey, SqlDbType.DateTimeOffset));
+            CreateSut();
+
+            // Act
+            var result = _sut.ConvertPropertiesToColumn(properties).ToArray();
+
+            // Assert
+            Assert.Equal(propertyKey, result[0].Key);
+            Assert.IsType<string>(result[0].Value);
+            Assert.Equal("1", result[0].Value);
+        }
+
+        private void CreateSut()
+        {
+            _sut = new PropertiesColumnDataGenerator(_columnOptions);
+        }
+    }
+}
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/SqlTypesTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/SqlTypesTests.cs
@@ -134,7 +134,7 @@ public void AuditLogMiscellaneousSqlTypes()
             Log.CloseAndFlush();
         }
 
-        private void Arrange(ICollection<SqlColumn> customColumns)
+        private static void Arrange(ICollection<SqlColumn> customColumns)
         {
             var columnOptions = new ColumnOptions
             {
diff --git a/test/Serilog.Sinks.MSSqlServer.Tests/TriggersOnLogTableTests.cs b/test/Serilog.Sinks.MSSqlServer.Tests/TriggersOnLogTableTests.cs

Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ private static void SetCommonColumnOptions(IConfigurationSection section, SqlCol`
`35`	`35`	`SetProperty.IfNotNull<bool>(section["nonClusteredIndex"], (val) => target.NonClusteredIndex = val);`
`36`	`36`	`}`
`37`	`37`
`38`		`- private void AddRemoveStandardColumns(IConfigurationSection config, ColumnOptions columnOptions)`
	`38`	`+ private static void AddRemoveStandardColumns(IConfigurationSection config, ColumnOptions columnOptions)`
`39`	`39`	`{`
`40`	`40`	`// add standard columns`
`41`	`41`	`var addStd = config.GetSection("addStandardColumns");`
`@@ -62,7 +62,7 @@ private void AddRemoveStandardColumns(IConfigurationSection config, ColumnOption`
`62`	`62`	`}`
`63`	`63`	`}`
`64`	`64`
`65`		`- private void AddAdditionalColumns(IConfigurationSection config, ColumnOptions columnOptions)`
	`65`	`+ private static void AddAdditionalColumns(IConfigurationSection config, ColumnOptions columnOptions)`
`66`	`66`	`{`
`67`	`67`	`var newcols =`
`68`	`68`	`config.GetSection("additionalColumns").Get<List<SqlColumn>>()`
`@@ -83,7 +83,7 @@ private void AddAdditionalColumns(IConfigurationSection config, ColumnOptions co`
`83`	`83`	`}`
`84`	`84`	`}`
`85`	`85`
`86`		`- private void ReadStandardColumns(IConfigurationSection config, ColumnOptions columnOptions)`
	`86`	`+ private static void ReadStandardColumns(IConfigurationSection config, ColumnOptions columnOptions)`
`87`	`87`	`{`
`88`	`88`	`var section = config.GetSection("id");`
`89`	`89`	`if (section != null)`
`@@ -148,7 +148,7 @@ private void ReadStandardColumns(IConfigurationSection config, ColumnOptions col`
`148`	`148`	`SetCommonColumnOptions(section, columnOptions.MessageTemplate);`
`149`	`149`	`}`
`150`	`150`
`151`		`- private void ReadMiscColumnOptions(IConfigurationSection config, ColumnOptions columnOptions)`
	`151`	`+ private static void ReadMiscColumnOptions(IConfigurationSection config, ColumnOptions columnOptions)`
`152`	`152`	`{`
`153`	`153`	`SetProperty.IfNotNull<bool>(config["disableTriggers"], (val) => columnOptions.DisableTriggers = val);`
`154`	`154`	`SetProperty.IfNotNull<bool>(config["clusteredColumnstoreIndex"], (val) => columnOptions.ClusteredColumnstoreIndex = val);`
Original file line number	Diff line number	Diff line change
`@@ -21,20 +21,20 @@ public SinkOptions ConfigureSinkOptions(SinkOptions sinkOptions, IConfigurationS`
`21`	`21`	`return sinkOptions;`
`22`	`22`	`}`
`23`	`23`
`24`		`- private void ReadTableOptions(IConfigurationSection config, SinkOptions sinkOptions)`
	`24`	`+ private static void ReadTableOptions(IConfigurationSection config, SinkOptions sinkOptions)`
`25`	`25`	`{`
`26`	`26`	`SetProperty.IfNotNull<string>(config["tableName"], val => sinkOptions.TableName = val);`
`27`	`27`	`SetProperty.IfNotNull<string>(config["schemaName"], val => sinkOptions.SchemaName = val);`
`28`	`28`	`SetProperty.IfNotNull<bool>(config["autoCreateSqlTable"], val => sinkOptions.AutoCreateSqlTable = val);`
`29`	`29`	`}`
`30`	`30`
`31`		`- private void ReadBatchSettings(IConfigurationSection config, SinkOptions sinkOptions)`
	`31`	`+ private static void ReadBatchSettings(IConfigurationSection config, SinkOptions sinkOptions)`
`32`	`32`	`{`
`33`	`33`	`SetProperty.IfNotNull<int>(config["batchPostingLimit"], val => sinkOptions.BatchPostingLimit = val);`
`34`	`34`	`SetProperty.IfNotNull<string>(config["batchPeriod"], val => sinkOptions.BatchPeriod = TimeSpan.Parse(val, CultureInfo.InvariantCulture));`
`35`	`35`	`}`
`36`	`36`
`37`		`- private void ReadAzureManagedIdentitiesOptions(IConfigurationSection config, SinkOptions sinkOptions)`
	`37`	`+ private static void ReadAzureManagedIdentitiesOptions(IConfigurationSection config, SinkOptions sinkOptions)`
`38`	`38`	`{`
`39`	`39`	`SetProperty.IfNotNull<bool>(config["useAzureManagedIdentity"], val => sinkOptions.UseAzureManagedIdentity = val);`
`40`	`40`	`SetProperty.IfNotNull<string>(config["azureServiceTokenProviderResource"], val => sinkOptions.AzureServiceTokenProviderResource = val);`
Original file line number	Diff line number	Diff line change
`@@ -10,7 +10,7 @@ public ColumnOptions ConfigureColumnOptions(MSSqlServerConfigurationSection conf`
`10`	`10`	`{`
`11`	`11`	`columnOptions = columnOptions ?? new ColumnOptions();`
`12`	`12`
`13`		`- AddRmoveStandardColumns(config, columnOptions);`
	`13`	`+ AddRemoveStandardColumns(config, columnOptions);`
`14`	`14`	`AddAdditionalColumns(config, columnOptions);`
`15`	`15`	`ReadStandardColumns(config, columnOptions);`
`16`	`16`	`ReadMiscColumnOptions(config, columnOptions);`
`@@ -55,7 +55,7 @@ private static void ReadPropertiesColumnOptions(MSSqlServerConfigurationSection`
`55`	`55`	`value => columnOptions.Properties.UsePropertyKeyAsElementName = value);`
`56`	`56`	`}`
`57`	`57`
`58`		`- private void AddRmoveStandardColumns(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)`
	`58`	`+ private static void AddRemoveStandardColumns(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)`
`59`	`59`	`{`
`60`	`60`	`// add standard columns`
`61`	`61`	`if (config.AddStandardColumns.Count > 0)`
`@@ -80,7 +80,7 @@ private void AddRmoveStandardColumns(MSSqlServerConfigurationSection config, Col`
`80`	`80`	`}`
`81`	`81`	`}`
`82`	`82`
`83`		`- private void AddAdditionalColumns(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)`
	`83`	`+ private static void AddAdditionalColumns(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)`
`84`	`84`	`{`
`85`	`85`	`if (config.Columns.Count > 0)`
`86`	`86`	`{`
`@@ -98,7 +98,7 @@ private void AddAdditionalColumns(MSSqlServerConfigurationSection config, Column`
`98`	`98`	`}`
`99`	`99`	`}`
`100`	`100`
`101`		`- private void ReadStandardColumns(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)`
	`101`	`+ private static void ReadStandardColumns(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)`
`102`	`102`	`{`
`103`	`103`	`SetCommonColumnOptions(config.Exception, columnOptions.Exception);`
`104`	`104`	`SetCommonColumnOptions(config.Id, columnOptions.Id);`
`@@ -123,7 +123,7 @@ private void ReadStandardColumns(MSSqlServerConfigurationSection config, ColumnO`
`123`	`123`	`value => columnOptions.TimeStamp.ConvertToUtc = value);`
`124`	`124`	`}`
`125`	`125`
`126`		`- private void ReadMiscColumnOptions(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)`
	`126`	`+ private static void ReadMiscColumnOptions(MSSqlServerConfigurationSection config, ColumnOptions columnOptions)`
`127`	`127`	`{`
`128`	`128`	`SetProperty.IfProvided<bool>(config, nameof(columnOptions.DisableTriggers), value => columnOptions.DisableTriggers = value);`
`129`	`129`	`SetProperty.IfProvided<bool>(config, nameof(columnOptions.ClusteredColumnstoreIndex), value => columnOptions.ClusteredColumnstoreIndex = value);`
Original file line number	Diff line number	Diff line change
`@@ -16,21 +16,21 @@ public SinkOptions ConfigureSinkOptions(MSSqlServerConfigurationSection config,`
`16`	`16`	`return sinkOptions;`
`17`	`17`	`}`
`18`	`18`
`19`		`- private void ReadTableOptions(MSSqlServerConfigurationSection config, SinkOptions sinkOptions)`
	`19`	`+ private static void ReadTableOptions(MSSqlServerConfigurationSection config, SinkOptions sinkOptions)`
`20`	`20`	`{`
`21`	`21`	`SetProperty.IfProvided<string>(config.TableName, nameof(config.TableName.Value), value => sinkOptions.TableName = value);`
`22`	`22`	`SetProperty.IfProvided<string>(config.SchemaName, nameof(config.SchemaName.Value), value => sinkOptions.SchemaName = value);`
`23`	`23`	`SetProperty.IfProvided<bool>(config.AutoCreateSqlTable, nameof(config.AutoCreateSqlTable.Value),`
`24`	`24`	`value => sinkOptions.AutoCreateSqlTable = value);`
`25`	`25`	`}`
`26`	`26`
`27`		`- private void ReadBatchSettings(MSSqlServerConfigurationSection config, SinkOptions sinkOptions)`
	`27`	`+ private static void ReadBatchSettings(MSSqlServerConfigurationSection config, SinkOptions sinkOptions)`
`28`	`28`	`{`
`29`	`29`	`SetProperty.IfProvided<int>(config.BatchPostingLimit, nameof(config.BatchPostingLimit.Value), val => sinkOptions.BatchPostingLimit = val);`
`30`	`30`	`SetProperty.IfProvided<string>(config.BatchPeriod, nameof(config.BatchPeriod.Value), val => sinkOptions.BatchPeriod = TimeSpan.Parse(val, CultureInfo.InvariantCulture));`
`31`	`31`	`}`
`32`	`32`
`33`		`- private void ReadAzureManagedIdentitiesOptions(MSSqlServerConfigurationSection config, SinkOptions sinkOptions)`
	`33`	`+ private static void ReadAzureManagedIdentitiesOptions(MSSqlServerConfigurationSection config, SinkOptions sinkOptions)`
`34`	`34`	`{`
`35`	`35`	`SetProperty.IfProvided<bool>(config.UseAzureManagedIdentity, nameof(config.UseAzureManagedIdentity.Value),`
`36`	`36`	`value => sinkOptions.UseAzureManagedIdentity = value);`