Merge pull request #77 from serilog/dev

5.0.0 Release

Author: nblumhardt

src/Serilog.Sinks.MSSqlServer/LoggerConfigurationMSSqlServerExtensions.cs

@@ -38,6 +38,7 @@ public static class LoggerConfigurationMSSqlServerExtensions
         /// <param name="loggerConfiguration">The logger configuration.</param>
         /// <param name="connectionString">The connection string to the database where to store the events.</param>
         /// <param name="tableName">Name of the table to store the events in.</param>
+        /// <param name="schemaName">Name of the schema for the table to store the data in. The default is 'dbo'.</param>
         /// <param name="restrictedToMinimumLevel">The minimum log event level required in order to write an event to the sink.</param>
         /// <param name="batchPostingLimit">The maximum number of events to post in a single batch.</param>
         /// <param name="period">The time to wait between checking for event batches.</param>
@@ -55,7 +56,8 @@ public static LoggerConfiguration MSSqlServer(
             TimeSpan? period = null,
             IFormatProvider formatProvider = null,
             bool autoCreateSqlTable = false,
-            ColumnOptions columnOptions = null
+            ColumnOptions columnOptions = null,
+            string schemaName = "dbo"
             )
         {
             if (loggerConfiguration == null) throw new ArgumentNullException("loggerConfiguration");
@@ -85,7 +87,8 @@ public static LoggerConfiguration MSSqlServer(
                     defaultedPeriod,
                     formatProvider,
                     autoCreateSqlTable,
-                    columnOptions
+                    columnOptions,
+                    schemaName
                     ),
                 restrictedToMinimumLevel);
         }

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

@@ -48,6 +48,7 @@ public class MSSqlServerSink : PeriodicBatchingSink
         readonly DataTable _eventsTable;
         readonly IFormatProvider _formatProvider;
         readonly string _tableName;
+        readonly string _schemaName;
         private readonly ColumnOptions _columnOptions;
 
         private readonly HashSet<string> _additionalDataColumnNames;
@@ -60,6 +61,7 @@ public class MSSqlServerSink : PeriodicBatchingSink
         /// </summary>
         /// <param name="connectionString">Connection string to access the database.</param>
         /// <param name="tableName">Name of the table to store the data in.</param>
+        /// <param name="schemaName">Name of the schema for the table to store the data in. The default is 'dbo'.</param>
         /// <param name="batchPostingLimit">The maximum number of events to post in a single batch.</param>
         /// <param name="period">The time to wait between checking for event batches.</param>
         /// <param name="formatProvider">Supplies culture-specific formatting information, or null.</param>
@@ -72,7 +74,8 @@ public MSSqlServerSink(
             TimeSpan period,
             IFormatProvider formatProvider,
             bool autoCreateSqlTable = false,
-            ColumnOptions columnOptions = null
+            ColumnOptions columnOptions = null,
+            string schemaName = "dbo"
             )
             : base(batchPostingLimit, period)
         {
@@ -84,6 +87,7 @@ public MSSqlServerSink(
 
             _connectionString = connectionString;
             _tableName = tableName;
+            _schemaName = schemaName;
             _formatProvider = formatProvider;
             _columnOptions = columnOptions ?? new ColumnOptions();
             if (_columnOptions.AdditionalDataColumns != null)
@@ -99,7 +103,7 @@ public MSSqlServerSink(
             {
                 try
                 {
-                    SqlTableCreator tableCreator = new SqlTableCreator(connectionString);
+                    SqlTableCreator tableCreator = new SqlTableCreator(connectionString, _schemaName);
                     tableCreator.CreateTable(_eventsTable);
                 }
                 catch (Exception ex)
@@ -134,7 +138,7 @@ protected override async Task EmitBatchAsync(IEnumerable<LogEvent> events)
                             : new SqlBulkCopy(cn, SqlBulkCopyOptions.CheckConstraints | SqlBulkCopyOptions.FireTriggers, null)
                     )
                     {
-                        copy.DestinationTableName = _tableName;
+                        copy.DestinationTableName = string.Format("[{0}].[{1}]", _schemaName, _tableName);
                         foreach (var column in _eventsTable.Columns)
                         {
                             var columnName = ((DataColumn)column).ColumnName;

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

@@ -9,12 +9,14 @@ internal class SqlTableCreator
 	{
 		private readonly string _connectionString;
 		private string _tableName;
+                private string _schemaName;
 
 		#region Constructor
 
-		public SqlTableCreator(string connectionString)
+		public SqlTableCreator(string connectionString, string schemaName)
 		{
-			_connectionString = connectionString;
+		    _schemaName = schemaName;
+                    _connectionString = connectionString;
 		}
 
 		#endregion
@@ -29,7 +31,7 @@ public int CreateTable(DataTable table)
 		    _tableName = table.TableName;
 		    using (var conn = new SqlConnection(_connectionString))
 		    {
-		        string sql = GetSqlFromDataTable(_tableName, table);
+		        string sql = GetSqlFromDataTable(_tableName, table, _schemaName);
 		        using (SqlCommand cmd = new SqlCommand(sql, conn))
 		        {
 		            conn.Open();
@@ -42,12 +44,12 @@ public int CreateTable(DataTable table)
 
 		#region Static Methods
 
-		private static string GetSqlFromDataTable(string tableName, DataTable table)
+		private static string GetSqlFromDataTable(string tableName, DataTable table, string schema)
 		{
 			StringBuilder sql = new StringBuilder();
-			sql.AppendFormat("IF NOT EXISTS (SELECT * FROM sysobjects WHERE name = '{0}' AND xtype = 'U')", tableName);
+			sql.AppendFormat("IF NOT EXISTS (SELECT s.name, t.name FROM sys.tables t JOIN sys.schemas s ON t.schema_id = s.schema_id WHERE s.name = '{0}' AND t.name = '{1}')", schema, tableName);
 			sql.AppendLine(" BEGIN");
-			sql.AppendFormat(" CREATE TABLE [{0}] ( ", tableName);
+			sql.AppendFormat(" CREATE TABLE [{0}].[{1}] ( ", schema, tableName);
 
 			// columns
 			int numOfColumns = table.Columns.Count;

src/Serilog.Sinks.MSSqlServer/project.json

@@ -1,5 +1,5 @@
 {
-  "version": "4.2.0-*",
+  "version": "5.0.0-*",
   "description": "A Serilog sink that writes events to Microsoft SQL Server",
   "authors": [
     "Michiel van Oudheusden",