Merge remote-tracking branch 'customid/IdColumnOptions' into localdb-tests

Author: Colin Young

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

@@ -16,6 +16,8 @@ public class ColumnOptions
         /// </summary>
         public ColumnOptions()
         {
+            Id = new IdColumnOptions();
+
             Level = new LevelColumnOptions();
 
             Properties = new PropertiesColumnOptions();
@@ -63,6 +65,11 @@ public IDictionary<StandardColumn, string> Store
         /// </summary>
         public ICollection<DataColumn> AdditionalDataColumns { get; set; }
 
+        /// <summary>
+        ///     Options for the Id column.
+        /// </summary>
+        public IdColumnOptions Id { get; private set; }
+
         /// <summary>
         ///     Options for the Level column.
         /// </summary>
@@ -83,6 +90,17 @@ public IDictionary<StandardColumn, string> Store
         /// </summary>
         public LogEventColumnOptions LogEvent { get; private set; }
 
+        /// <summary>
+        ///     Options for the Id column.
+        /// </summary>
+        public class IdColumnOptions
+        {
+            /// <summary>
+            ///     The name of the Id column. "Id" is used if not set.
+            /// </summary>
+            public string ColumnName { get; set; }
+        }
+
         /// <summary>
         ///     Options for the Level column.
         /// </summary>

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

@@ -163,7 +163,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);