Merge pull request #117 from quinvit/dev-extend-column-data-type

Extend column definition in config

Author: nblumhardt

src/Serilog.Sinks.MSSqlServer/Configuration/ColumnConfig.cs

@@ -52,11 +52,31 @@ public string ColumnName
         /// Type of column as it exists in SQL Server
         /// </summary>
         [ConfigurationProperty("DataType", IsRequired = true, IsKey = false, DefaultValue ="varchar")]
-        [RegexStringValidator("(bigint)|(bit)|(char)|(date)|(datetime)|(datetime2)|(decimal)|(float)|(int)|(money)|(nchar)|(ntext)|(numeric)|(nvarchar)|(real)|(smalldatetime)|(smallint)|(smallmoney)|(text)|(time)|(uniqueidentifier)|(varchar)")]
+        [RegexStringValidator("(bigint)|(bit)|(binary)|(varbinary)|(char)|(date)|(datetime)|(datetime2)|(decimal)|(float)|(int)|(money)|(nchar)|(ntext)|(numeric)|(nvarchar)|(real)|(smalldatetime)|(smallint)|(smallmoney)|(text)|(time)|(uniqueidentifier)|(varchar)")]
         public string DataType
         {
             get { return (string)this["DataType"]; }
             set { this["DataType"] = value; }
         }
+
+        /// <summary>
+        /// Length of column as it exists in SQL Server for string or binary data type.
+        /// </summary>
+        [ConfigurationProperty("DataLength", IsRequired = false, IsKey = false, DefaultValue = 128)]
+        public int DataLength
+        {
+            get { return (int)this["DataLength"]; }
+            set { this["DataLength"] = value; }
+        }
+
+        /// <summary>
+        /// Allow nullable column as it exists in SQL Server.
+        /// </summary>
+        [ConfigurationProperty("AllowNull", IsRequired = false, IsKey = false, DefaultValue = true)]
+        public bool AllowNull
+        {
+            get { return (bool)this["AllowNull"]; }
+            set { this["AllowNull"] = value; }
+        }
     }
 }

src/Serilog.Sinks.MSSqlServer/LoggerConfigurationMSSqlServerExtensions.cs

@@ -190,6 +190,11 @@ private static void GenerateDataColumnsFromConfig(MSSqlServerConfigurationSectio
                     case "bigint":
                         dataType = typeof(long);
                         break;
+                    case "varbinary":
+                    case "binary":
+                        dataType = Type.GetType("System.Byte[]");
+                        column.ExtendedProperties["DataLength"] = c.DataLength;
+                        break;
                     case "bit":
                         dataType = typeof(bool);
                         break;
@@ -199,7 +204,8 @@ private static void GenerateDataColumnsFromConfig(MSSqlServerConfigurationSectio
                     case "nvarchar":
                     case "text":
                     case "varchar":
-                        dataType = typeof(string);
+                        dataType = Type.GetType("System.String");
+                        column.MaxLength = c.DataLength;
                         break;
                     case "date":
                     case "datetime":
@@ -232,11 +238,14 @@ private static void GenerateDataColumnsFromConfig(MSSqlServerConfigurationSectio
                         dataType = typeof(Guid);
                         break;
                 }
+
                 column.DataType = dataType;
+                column.AllowDBNull = c.AllowNull;
                 if (columnOptions.AdditionalDataColumns == null)
                 {
                     columnOptions.AdditionalDataColumns = new Collection<DataColumn>();
                 }
+
                 columnOptions.AdditionalDataColumns.Add(column);
             }
         }

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/SqlTableCreator.cs

@@ -101,10 +101,14 @@ private static string SqlGetType(object type, int columnSize, int numericPrecisi
                     sqlType = "TINYINT";
                     break;
 
-                case "System.String":
-                    sqlType = "NVARCHAR(" + ((columnSize == -1) ? "MAX" : columnSize.ToString()) + ")";
+                case "System.Byte[]":
+                    sqlType = columnSize == -1 ? "VARBINARY(MAX)" : "VARBINARY(" + columnSize.ToString() + ")";
                     break;
 
+                case "System.String":
+	                sqlType = "NVARCHAR(" + ((columnSize == -1) ? "MAX" : columnSize.ToString()) + ")";
+	                break;
+
                 case "System.Decimal":
                     if (numericScale > 0)
                         sqlType = "REAL";
@@ -153,4 +157,5 @@ private static string SqlGetType(DataColumn column)
 
         #endregion
     }
+
 }