Removed the obsolete methods

Author: JonPSmith

ReleaseNotes.md

@@ -1,10 +1,11 @@
 # Release notes
 
-## 6.0.0-priview001
+## 5.1.0-preview001
 
-- Updated to Net6-rc.2 preview
+- Updated to support Net5 and Net6-rc.2 preview
 - Added PostgreSQL database helpers
 - Added the Seed Database feature back in at request of users
+- Removed obsolete methods: ...OptionsWithLogging (use ...OptionsWithLogTo), CreateEmptyViaWipe (use EncureClean)
 
 ## 5.0.0
 

Test/UnitTests/TestDataLayer/TestEfLoggingDecodeBookContext.cs

@@ -27,22 +27,19 @@ public TestEnsureClean(ITestOutputHelper output)
         public void TestEnsureDeletedThenCreateDatabase1Ok()
         {
             //SETUP
-            var showLog = false;
-#pragma warning disable 618
-            var options = this.CreateUniqueClassOptionsWithLogging<DbContext1>(log =>
-#pragma warning restore 618
+            var logToOptions = new LogToOptions
             {
-                if (showLog)
-                    _output.WriteLine(log.Message);
-            });
+                ShowLog = false
+            };
+            var options = this.CreateUniqueClassOptionsWithLogTo<DbContext1>(log => _output.WriteLine(log), logToOptions);
             using (var context = new DbContext1(options))
             {
                 context.Database.EnsureDeleted();
 
                 //ATTEMPT
-                showLog = true;
+                logToOptions.ShowLog = true;
                 context.Database.EnsureClean();
-                showLog = false;
+                logToOptions.ShowLog = false;
 
                 //VERIFY
                 context.Add(new TopClass1());
@@ -54,22 +51,19 @@ public void TestEnsureDeletedThenCreateDatabase1Ok()
         public void TestEnsureDeletedThenCreateDatabase2Ok()
         {
             //SETUP
-            var showLog = false;
-#pragma warning disable 618
-            var options = this.CreateUniqueClassOptionsWithLogging<DbContext2>(log =>
-#pragma warning restore 618
+            var logToOptions = new LogToOptions
             {
-                if (showLog)
-                    _output.WriteLine(log.Message);
-            });
+                ShowLog = false
+            };
+            var options = this.CreateUniqueClassOptionsWithLogTo<DbContext2>(log => _output.WriteLine(log), logToOptions);
             using (var context = new DbContext2(options))
             {
                 context.Database.EnsureDeleted();
 
                 //ATTEMPT
-                showLog = true;
+                logToOptions.ShowLog = true;
                 context.Database.EnsureClean();
-                showLog = false;
+                logToOptions.ShowLog = false;
 
                 //VERIFY
                 context.Add(new TopClass2());

Test/UnitTests/TestDataLayer/TestEfLoggingDecodeSpecializedDbContext.cs

@@ -0,0 +1,59 @@
+// Copyright (c) 2020 Jon P Smith, GitHub: JonPSmith, web: http://www.thereformedprogrammer.net/
+// Licensed under MIT license. See License.txt in the project root for license information.
+
+using System.Collections.Generic;
+using System.Linq;
+using DataLayer.BookApp.EfCode;
+using Microsoft.Data.Sqlite;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.Extensions.Logging;
+using Test.Helpers;
+using TestSupport.EfHelpers;
+using Xunit;
+using Xunit.Abstractions;
+using Xunit.Extensions.AssertExtensions;
+
+namespace Test.UnitTests.TestDataLayer
+{
+    public class TestMyLoggerProviderActionOut
+    {
+        private readonly ITestOutputHelper _output;
+
+        public TestMyLoggerProviderActionOut(ITestOutputHelper output) 
+        {
+            _output = output;
+        }
+
+        [Fact]
+        public void TestDecodeMessageNotSensitiveLogging()
+        {
+            //SETUP
+            var connection = new SqliteConnection("DataSource=:memory:");
+            connection.Open();
+
+            var logs = new List<LogOutput>();
+            var options = new DbContextOptionsBuilder<BookContext>()
+                .UseLoggerFactory(new LoggerFactory(new[] { new MyLoggerProviderActionOut(l => logs.Add(l))}))
+                .UseSqlite(connection)
+                .EnableSensitiveDataLogging()
+                .Options;
+            using (var context = new BookContext(options))
+            {
+                context.Database.EnsureCreated();
+                context.SeedDatabaseFourBooks();
+
+                //ATTEMPT
+                var id = context.Books.First().BookId;
+                var book = context.Books.Single(x => x.BookId == id);
+                var decoded = logs.Last().DecodeMessage();
+
+                //VERIFY
+                var sqlCommand = decoded.Split('\n').Skip(1).Select(x => x.Trim()).ToArray();
+                sqlCommand[0].ShouldEqual(
+                    "SELECT \"b\".\"BookId\", \"b\".\"Description\", \"b\".\"ImageUrl\", \"b\".\"Price\", \"b\".\"PublishedOn\", \"b\".\"Publisher\", \"b\".\"SoftDeleted\", \"b\".\"Title\"");
+                sqlCommand[1].ShouldEqual("FROM \"Books\" AS \"b\"");
+                sqlCommand[2].ShouldEqual("WHERE NOT (\"b\".\"SoftDeleted\") AND (\"b\".\"BookId\" = '1')");
+            }
+        }
+    }
+}