Merge branch 'dev' into custom-column-names

Author: Colin Young

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/ColumnOptions.cs

@@ -17,6 +17,8 @@ public class ColumnOptions
         /// </summary>
         public ColumnOptions()
         {
+            Id = new IdColumnOptions();
+
             Level = new LevelColumnOptions();
 
             Properties = new PropertiesColumnOptions();
@@ -67,30 +69,35 @@ public ICollection<StandardColumn> Store
         public ICollection<DataColumn> AdditionalDataColumns { get; set; }
 
         /// <summary>
-        /// Options for the Exception column.
+        ///     Options for the Id column.
         /// </summary>
-        public ExceptionColumnOptions Exception { get; set; }
+        public IdColumnOptions Id { get; private set; }
 
         /// <summary>
-        /// Options for the MessageTemplate column.
+        ///     Options for the Level column.
         /// </summary>
-        public MessageTemplateColumnOptions MessageTemplate { get; set; }
+        public LevelColumnOptions Level { get; private set; }
 
         /// <summary>
-        /// Options for the Message column.
+        ///     Options for the Properties column.
         /// </summary>
-        public MessageColumnOptions Message { get; set; }
+        public PropertiesColumnOptions Properties { get; private set; }
 
         /// <summary>
-        ///     Options for the Level column.
+        /// Options for the Exception column.
         /// </summary>
-        public LevelColumnOptions Level { get; private set; }
+        public ExceptionColumnOptions Exception { get; set; }
 
         /// <summary>
-        ///     Options for the Properties column.
+        /// Options for the MessageTemplate column.
         /// </summary>
-        public PropertiesColumnOptions Properties { get; private set; }
+        public MessageTemplateColumnOptions MessageTemplate { get; set; }
 
+        /// <summary>
+        /// Options for the Message column.
+        /// </summary>
+        public MessageColumnOptions Message { get; set; }
+        
         /// <summary>
         ///     Options for the TimeStamp column.
         /// </summary>
@@ -101,6 +108,11 @@ public ICollection<StandardColumn> Store
         /// </summary>
         public LogEventColumnOptions LogEvent { get; private set; }
 
+        /// <summary>
+        ///     Options for the Id column.
+        /// </summary>
+        public class IdColumnOptions : CommonColumnOptions { }
+
         /// <summary>
         ///     Options for the Level column.
         /// </summary>

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerSink.cs

@@ -161,7 +161,7 @@ DataTable CreateDataTable()
             var id = new DataColumn
             {
                 DataType = Type.GetType("System.Int32"),
-                ColumnName = "Id",
+                ColumnName = !string.IsNullOrWhiteSpace(_columnOptions.Id.ColumnName) ? _columnOptions.Id.ColumnName : "Id",
                 AutoIncrement = true
             };
             eventsTable.Columns.Add(id);