Initial changes to allow custom names for standard columns

Author: Colin Young

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

@@ -1,6 +1,5 @@
 using System;
 using System.Collections.Generic;
-using System.Collections.ObjectModel;
 using System.Data;
 
 namespace Serilog.Sinks.MSSqlServer
@@ -10,7 +9,7 @@ namespace Serilog.Sinks.MSSqlServer
     /// </summary>
     public class ColumnOptions
     {
-        private ICollection<StandardColumn> _store;
+        private IDictionary<StandardColumn, string> _store;
 
         /// <summary>
         ///     Default constructor.
@@ -21,14 +20,14 @@ public ColumnOptions()
 
             Properties = new PropertiesColumnOptions();
 
-            Store = new Collection<StandardColumn>
+            Store = new Dictionary<StandardColumn, string>
             {
-                StandardColumn.Message,
-                StandardColumn.MessageTemplate,
-                StandardColumn.Level,
-                StandardColumn.TimeStamp,
-                StandardColumn.Exception,
-                StandardColumn.Properties
+                { StandardColumn.Message, StandardColumn.Message.ToString()},
+                { StandardColumn.MessageTemplate, StandardColumn.MessageTemplate.ToString()},
+                { StandardColumn.Level, StandardColumn.Level.ToString()},
+                { StandardColumn.TimeStamp, StandardColumn.TimeStamp.ToString()},
+                { StandardColumn.Exception,StandardColumn.Exception.ToString()},
+                { StandardColumn.Properties, StandardColumn.Exception.ToString()}
             };
 
             TimeStamp = new TimeStampColumnOptions();
@@ -39,17 +38,17 @@ public ColumnOptions()
         /// <summary>
         ///     A list of columns that will be stored in the logs table in the database.
         /// </summary>
-        public ICollection<StandardColumn> Store
+        public IDictionary<StandardColumn, string> Store
         {
             get { return _store; }
             set
             {
                 if (value == null)
                 {
-                    _store = new Collection<StandardColumn>();
+                    _store = new Dictionary<StandardColumn, string>();
                     foreach (StandardColumn column in Enum.GetValues(typeof (StandardColumn)))
                     {
-                        _store.Add(column);
+                        _store.Add(column, column.ToString());
                     }
                 }
                 else

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

@@ -90,7 +90,7 @@ public MSSqlServerSink(
             if (_columnOptions.AdditionalDataColumns != null)
                 _additionalDataColumnNames = new HashSet<string>(_columnOptions.AdditionalDataColumns.Select(c => c.ColumnName), StringComparer.OrdinalIgnoreCase);
 
-            if (_columnOptions.Store.Contains(StandardColumn.LogEvent))
+            if (_columnOptions.Store.ContainsKey(StandardColumn.LogEvent))
                 _jsonFormatter = new JsonFormatter(formatProvider: formatProvider);
 
             // Prepare the data table
@@ -168,90 +168,43 @@ DataTable CreateDataTable()
             };
             eventsTable.Columns.Add(id);
 
-            if (_columnOptions.Store.Contains(StandardColumn.Message))
+            foreach (var standardColumn in _columnOptions.Store)
             {
-                var message = new DataColumn
+                switch (standardColumn.Key)
                 {
-                    DataType = typeof (string),
-                    MaxLength = -1,
-                    ColumnName = "Message"
-                };
-                eventsTable.Columns.Add(message);
-            }
-
-            if (_columnOptions.Store.Contains(StandardColumn.MessageTemplate))
-            {
-                var messageTemplate = new DataColumn
-                {
-                    DataType = typeof (string),
-                    MaxLength = -1,
-                    ColumnName = "MessageTemplate",
-
-                };
-                eventsTable.Columns.Add(messageTemplate);
-            }
-
-            if (_columnOptions.Store.Contains(StandardColumn.Level))
-            {
-                var level = new DataColumn
-                {
-                    ColumnName = "Level"
-                };
-
-                if (_columnOptions.Level.StoreAsEnum)
-                {
-                    level.DataType = typeof (byte);
-                }
-                else
-                {
-                    level.DataType = typeof (string);
-                    level.MaxLength = 128;
+                    case StandardColumn.Level:
+                        eventsTable.Columns.Add(new DataColumn
+                        {
+                            DataType = _columnOptions.Level.StoreAsEnum ? typeof(byte) : typeof(string),
+                            MaxLength = _columnOptions.Level.StoreAsEnum ? 0 : 128,
+                            ColumnName = standardColumn.Value
+                        });
+                        break;
+                    case StandardColumn.TimeStamp:
+                        eventsTable.Columns.Add(new DataColumn
+                        {
+                            DataType = Type.GetType("System.DateTime"),
+                            ColumnName = "TimeStamp",
+                            AllowDBNull = false
+                        });
+                        break;
+                    case StandardColumn.LogEvent:
+                        eventsTable.Columns.Add(new DataColumn
+                        {
+                            DataType = Type.GetType("System.String"),
+                            ColumnName = "LogEvent"
+                        });
+                        break;
+                    default:
+                        eventsTable.Columns.Add(new DataColumn
+                        {
+                            DataType = typeof(string),
+                            MaxLength = -1,
+                            ColumnName = standardColumn.Value
+                        });
+                        break;
                 }
 
-                eventsTable.Columns.Add(level);
-            }
-
-            if (_columnOptions.Store.Contains(StandardColumn.TimeStamp))
-            {
-                var timestamp = new DataColumn
-                {
-                    DataType = Type.GetType("System.DateTime"),
-                    ColumnName = "TimeStamp",
-                    AllowDBNull = false
-                };
-                eventsTable.Columns.Add(timestamp);
-            }
-
-            if (_columnOptions.Store.Contains(StandardColumn.Exception))
-            {
-                var exception = new DataColumn
-                {
-                    DataType = typeof (string),
-                    MaxLength = -1,
-                    ColumnName = "Exception"
-                };
-                eventsTable.Columns.Add(exception);
-            }
-
-            if (_columnOptions.Store.Contains(StandardColumn.Properties))
-            {
-                var props = new DataColumn
-                {
-                    DataType = typeof (string),
-                    MaxLength = -1,
-                    ColumnName = "Properties",
-                };
-                eventsTable.Columns.Add(props);
-            }
-
-            if (_columnOptions.Store.Contains(StandardColumn.LogEvent))
-            {
-                var eventData = new DataColumn
-                {
-                    DataType = Type.GetType("System.String"),
-                    ColumnName = "LogEvent"
-                };
-                eventsTable.Columns.Add(eventData);
             }
 
             if (_columnOptions.AdditionalDataColumns != null)
@@ -274,7 +227,7 @@ void FillDataTable(IEnumerable<LogEvent> events)
             {
                 var row = _eventsTable.NewRow();
 
-                foreach (var column in _columnOptions.Store)
+                foreach (var column in _columnOptions.Store.Keys)
                 {
                     switch (column)
                     {