Merge pull request #266 from ckadluba/azure-managed-identities

Added an integration test to proove issue #201 is fixed.

Author: ckadluba

test/Serilog.Sinks.MSSqlServer.Tests/AdditionalPropertiesTests.cs

@@ -0,0 +1,46 @@
+using System.Collections.Generic;
+using System.Data;
+using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Options;
+using Serilog.Sinks.MSSqlServer.Tests.TestUtils;
+using Xunit;
+using Xunit.Abstractions;
+
+namespace Serilog.Sinks.MSSqlServer.Tests
+{
+    public class AdditionalPropertiesTests : DatabaseTestsBase
+    {
+        public AdditionalPropertiesTests(ITestOutputHelper output) : base(output)
+        {
+        }
+
+        [Fact]
+        public void CreatesTableWithTwoAdditionalProperties()
+        {
+            // Arrange
+            const string additionalColumnName1 = "AdditionalColumn1";
+            const string additionalColumnName2 = "AdditionalColumn2";
+            var columnOptions = new ColumnOptions
+            {
+                AdditionalColumns = new List<SqlColumn>
+                {
+                    new SqlColumn(additionalColumnName1, SqlDbType.NVarChar, true, dataLength: 100),
+                    new SqlColumn(additionalColumnName2, SqlDbType.Int, true)
+                }
+            };
+
+            // Act
+            using (var sink = new MSSqlServerSink(DatabaseFixture.LogEventsConnectionString,
+                sinkOptions: new SinkOptions
+                {
+                    TableName = DatabaseFixture.LogTableName,
+                    AutoCreateSqlTable = true
+                },
+                columnOptions: columnOptions,
+                formatProvider: null))
+            { }
+
+            // Assert
+            VerifyDatabaseColumnsWereCreated(columnOptions.AdditionalColumns);
+        }
+    }
+}

test/Serilog.Sinks.MSSqlServer.Tests/TestUtils/DapperQueryTemplates.cs

@@ -25,6 +25,8 @@ public class InfoSchema
         public string ColumnName { get; set; }
         public string SchemaName { get; set; }
         public string DataType { get; set; }
+        public string DataLength { get; set; }
+        public string AllowNull { get; set; }
     }
 
     public class sp_pkey

test/Serilog.Sinks.MSSqlServer.Tests/TestUtils/DatabaseTestsBase.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Data.SqlClient;
+using System.Globalization;
 using System.Linq;
 using Dapper;
 using FluentAssertions;
@@ -43,6 +44,41 @@ protected static void VerifyDatabaseColumnsWereCreated(IEnumerable<string> colum
             }
         }
 
+        protected static void VerifyDatabaseColumnsWereCreated(IEnumerable<SqlColumn> columnDefinitions)
+        {
+            if (columnDefinitions == null)
+            {
+                return;
+            }
+
+            using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))
+            {
+                var logEvents = conn.Query<InfoSchema>($@"SELECT COLUMN_NAME AS ColumnName, UPPER(DATA_TYPE) as DataType, CHARACTER_MAXIMUM_LENGTH as DataLength, IS_NULLABLE as AllowNull
+                    FROM {DatabaseFixture.Database}.INFORMATION_SCHEMA.COLUMNS WHERE TABLE_NAME = '{DatabaseFixture.LogTableName}'");
+                var infoSchema = logEvents as InfoSchema[] ?? logEvents.ToArray();
+
+                foreach (var definition in columnDefinitions)
+                {
+                    var column = infoSchema.SingleOrDefault(c => c.ColumnName == definition.ColumnName);
+                    Assert.NotNull(column);
+                    var definitionDataType = definition.DataType.ToString().ToUpperInvariant();
+                    Assert.Equal(definitionDataType, column.DataType);
+                    if (definitionDataType == "NVARCHAR" || definitionDataType == "VARCHAR")
+                    {
+                        Assert.Equal(definition.DataLength.ToString(CultureInfo.InvariantCulture), column.DataLength);
+                    }
+                    if (definition.AllowNull)
+                    {
+                        Assert.Equal("YES", column.AllowNull);
+                    }
+                    else
+                    {
+                        Assert.Equal("NO", column.AllowNull);
+                    }
+                }
+            }
+        }
+
         protected static void VerifyIdColumnWasCreatedAndHasIdentity(string idColumnName = "Id")
         {
             using (var conn = new SqlConnection(DatabaseFixture.LogEventsConnectionString))