Merge pull request #482 from serilog-mssql/478-autocreatedb-no-exception-if-db-exists

478 autocreatedb no exception if db exists

Author: ckadluba

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

@@ -32,6 +32,7 @@ public void Execute()
             catch (Exception ex)
             {
                 HandleException(ex);
+                throw;
             }
         }
 

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

@@ -1,4 +1,5 @@
 using System;
+using System.Text;
 using static System.FormattableString;
 
 namespace Serilog.Sinks.MSSqlServer.Platform
@@ -15,6 +16,15 @@ public SqlCreateDatabaseWriter(string databaseName)
         public string DatabaseName => _databaseName;
 
         public string GetSql()
-            => Invariant($"CREATE DATABASE [{_databaseName}]");
+        {
+            var sql = new StringBuilder();
+
+            sql.AppendLine(Invariant($"IF NOT EXISTS (SELECT name FROM sys.databases WHERE name = '{_databaseName}')"));
+            sql.AppendLine("BEGIN");
+            sql.AppendLine(Invariant($"CREATE DATABASE [{_databaseName}]"));
+            sql.AppendLine("END");
+
+            return sql.ToString();
+        }
     }
 }

test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/SqlCommandExecutorTests.cs

@@ -100,7 +100,7 @@ public void HandlesExceptionFromSqlWriter()
             };
 
             // Act
-            _sut.Execute();
+            Assert.Throws<InvalidOperationException>(() => _sut.Execute());
 
             // Assert
             Assert.True(handlerCalled);
@@ -124,7 +124,7 @@ public void HandlesExceptionFromConnectionFactory()
             };
 
             // Act
-            _sut.Execute();
+            Assert.Throws<InvalidOperationException>(() => _sut.Execute());
 
             // Assert
             Assert.True(handlerCalled);
@@ -148,7 +148,7 @@ public void HandlesExceptionFromConnection()
             };
 
             // Act
-            _sut.Execute();
+            Assert.Throws<InvalidOperationException>(() => _sut.Execute());
 
             // Assert
             Assert.True(handlerCalled);
@@ -172,7 +172,7 @@ public void HandlesExceptionFromCommand()
             };
 
             // Act
-            _sut.Execute();
+            Assert.Throws<InvalidOperationException>(() => _sut.Execute());
 
             // Assert
             Assert.True(handlerCalled);

test/Serilog.Sinks.MSSqlServer.Tests/Sinks/MSSqlServer/Platform/SqlCreateDatabaseWriterTests.cs

@@ -12,7 +12,7 @@ public void GetSqlWritesCorrectCommand()
         {
             // Arrange
             const string databaseName = "LogDatabase";
-            const string expectedResult = "CREATE DATABASE [LogDatabase]";
+            const string expectedResult = "IF NOT EXISTS (SELECT name FROM sys.databases WHERE name = 'LogDatabase')\r\nBEGIN\r\nCREATE DATABASE [LogDatabase]\r\nEND\r\n";
             var sut = new SqlCreateDatabaseWriter(databaseName);
 
             // Act
@@ -27,7 +27,7 @@ public void GetSqlWritesCorrectCommandForDatabaseNameWithSpaces()
         {
             // Arrange
             const string databaseName = "Log Data Base";
-            const string expectedResult = "CREATE DATABASE [Log Data Base]";
+            const string expectedResult = "IF NOT EXISTS (SELECT name FROM sys.databases WHERE name = 'Log Data Base')\r\nBEGIN\r\nCREATE DATABASE [Log Data Base]\r\nEND\r\n";
             var sut = new SqlCreateDatabaseWriter(databaseName);
 
             // Act