Moved exception handler into SqlTableCreator.

Author: ckadluba

src/Serilog.Sinks.MSSqlServer/GlobalSuppressions.cs

@@ -7,7 +7,7 @@
 
 [assembly: SuppressMessage("Globalization", "CA1303:Do not pass literals as localized parameters", Justification = "Supplying string literals and not using resources is accepted within this project.", Scope = "namespaceanddescendants", Target = "Serilog.Sinks.MSSqlServer")]
 [assembly: SuppressMessage("Security", "CA2100:Review SQL queries for security vulnerabilities", Justification = "Too hard to change. Accepted for now.", Scope = "namespaceanddescendants", Target = "Serilog.Sinks.MSSqlServer")]
-[assembly: SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Too hard to change. Accepted for now.", Scope = "member", Target = "~M:Serilog.Sinks.MSSqlServer.MSSqlServerSinkTraits.#ctor(System.String,System.String,Serilog.Sinks.MSSqlServer.ColumnOptions,System.IFormatProvider,System.Boolean,Serilog.Formatting.ITextFormatter,Serilog.Sinks.MSSqlServer.Platform.ISqlTableCreator)")]
+[assembly: SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Too hard to change. Accepted for now.", Scope = "member", Target = "~M:Serilog.Sinks.MSSqlServer.Platform.SqlTableCreator.CreateTable(System.String,System.String,System.Data.DataTable,Serilog.Sinks.MSSqlServer.ColumnOptions)")]
 [assembly: SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Too hard to change. Accepted for now.", Scope = "member", Target = "~M:Serilog.Sinks.MSSqlServer.MSSqlServerSink.EmitBatchAsync(System.Collections.Generic.IEnumerable{Serilog.Events.LogEvent})~System.Threading.Tasks.Task")]
 [assembly: SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Too hard to change. Accepted for now.", Scope = "member", Target = "~M:Serilog.Sinks.MSSqlServer.Output.StandardColumnDataGenerator.ConvertPropertiesToXmlStructure(System.Collections.Generic.IEnumerable{System.Collections.Generic.KeyValuePair{System.String,Serilog.Events.LogEventPropertyValue}})~System.String")]
 [assembly: SuppressMessage("Design", "CA1031:Do not catch general exception types", Justification = "Too hard to change. Accepted for now.", Scope = "member", Target = "~M:Serilog.Sinks.MSSqlServer.Output.PropertiesColumnDataGenerator.TryChangeType(System.Object,System.Type,System.Object@)~System.Boolean")]

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/MSSqlServerSinkTraits.cs

@@ -77,14 +77,7 @@ internal MSSqlServerSinkTraits(
 
             if (autoCreateSqlTable)
             {
-                try
-                {
-                    sqlTableCreator.CreateTable(_schemaName, _tableName, EventTable, _columnOptions); // return code ignored, 0 = failure?
-                }
-                catch (Exception ex)
-                {
-                    SelfLog.WriteLine($"Exception creating table {tableName}:\n{ex}");
-                }
+                sqlTableCreator.CreateTable(_schemaName, _tableName, EventTable, _columnOptions);
             }
         }
 

src/Serilog.Sinks.MSSqlServer/Sinks/MSSqlServer/Platform/ISqlTableCreator.cs

@@ -4,6 +4,6 @@ namespace Serilog.Sinks.MSSqlServer.Platform
 {
     internal interface ISqlTableCreator
     {
-        int CreateTable(string schemaName, string tableName, DataTable dataTable, ColumnOptions columnOptions);
+        void CreateTable(string schemaName, string tableName, DataTable dataTable, ColumnOptions columnOptions);
     }
 }

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

@@ -1,6 +1,7 @@
 using System;
 using System.Data;
 using System.Data.SqlClient;
+using Serilog.Debugging;
 using Serilog.Sinks.MSSqlServer.Sinks.MSSqlServer.Platform;
 
 namespace Serilog.Sinks.MSSqlServer.Platform
@@ -16,17 +17,23 @@ public SqlTableCreator(ISqlCreateTableWriter sqlCreateTableWriter, ISqlConnectio
             _sqlConnectionFactory = sqlConnectionFactory ?? throw new ArgumentNullException(nameof(sqlConnectionFactory));
         }
 
-        public int CreateTable(string schemaName, string tableName, DataTable dataTable, ColumnOptions columnOptions)
+        public void CreateTable(string schemaName, string tableName, DataTable dataTable, ColumnOptions columnOptions)
         {
-            using (var conn = _sqlConnectionFactory.Create())
+            try
             {
-                var sql = _sqlCreateTableWriter.GetSqlFromDataTable(schemaName, tableName, dataTable, columnOptions);
-                using (var cmd = new SqlCommand(sql, conn))
+                using (var conn = _sqlConnectionFactory.Create())
                 {
-                    conn.Open();
-                    return cmd.ExecuteNonQuery();
+                    var sql = _sqlCreateTableWriter.GetSqlFromDataTable(schemaName, tableName, dataTable, columnOptions);
+                    using (var cmd = new SqlCommand(sql, conn))
+                    {
+                        conn.Open();
+                        cmd.ExecuteNonQuery();
+                    }
                 }
-
+            }
+            catch (Exception ex)
+            {
+                SelfLog.WriteLine($"Exception creating table {tableName}:\n{ex}");
             }
         }
     }