From b4e41603151260edb560b0b7a026ed7dea4853fb Mon Sep 17 00:00:00 2001
From: James A Sutherland <>
Date: Wed, 3 Jan 2024 12:29:00 -0600
Subject: [PATCH] Variable scope fix

---
 ...cuteCommandRedactCHIsFromCatalogueTests.cs | 32 +++++++------------
 1 file changed, 11 insertions(+), 21 deletions(-)

diff --git a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandRedactCHIsFromCatalogueTests.cs b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandRedactCHIsFromCatalogueTests.cs
index 5405cb9d90..90f70ef7f5 100644
--- a/Rdmp.Core.Tests/CommandExecution/ExecuteCommandRedactCHIsFromCatalogueTests.cs
+++ b/Rdmp.Core.Tests/CommandExecution/ExecuteCommandRedactCHIsFromCatalogueTests.cs
@@ -24,16 +24,13 @@ public void RedactCHIsFromCatalogue_ValidSingle()
         var biochemistry = CatalogueRepository.GetAllObjects<Catalogue>().Where(c => c.Name == "Biochemistry").First();
         var tbl = db.DiscoverTables(true).Where(dt => dt.GetRuntimeName().Contains("Biochemistry")).First();
         var updateSQL = $"UPDATE top (2) {tbl.GetRuntimeName()} set SampleType = 'F1111111111'";
-        using (var con = tbl.Database.Server.GetConnection())
-        {
-            con.Open();
-            var updateCmd = tbl.Database.Server.GetCommand(updateSQL, con);
-            updateCmd.ExecuteNonQuery();
-        }
+        using var con = tbl.Database.Server.GetConnection();
+        con.Open();
+        var updateCmd = tbl.Database.Server.GetCommand(updateSQL, con);
+        updateCmd.ExecuteNonQuery();
         var cmd = new ExecuteCommandRedactCHIsFromCatalogue(new ThrowImmediatelyActivator(RepositoryLocator), biochemistry, null);
         Assert.DoesNotThrow(() => cmd.Execute());
         using var dt = new DataTable();
-        using var con = tbl.Database.Server.GetConnection();
         using var findCmd = tbl.Database.Server.GetCommand($"select * from {tbl.GetRuntimeName()} where SampleType = 'F#########1'", con);
         using var da = tbl.Database.Server.GetDataAdapter(findCmd);
         da.Fill(dt);
@@ -52,12 +49,10 @@ public void RedactCHIsFromCatalogue_Allowlist()
         var biochemistry = CatalogueRepository.GetAllObjects<Catalogue>().Where(c => c.Name == "Biochemistry").First();
         var tbl = db.DiscoverTables(true).Where(dt => dt.GetRuntimeName().Contains("Biochemistry")).First();
         var updateSQL = $"UPDATE top (2) {tbl.GetRuntimeName()} set SampleType = 'F1111111111'";
-        using (var con = tbl.Database.Server.GetConnection())
-        {
-            con.Open();
-            var updateCmd = tbl.Database.Server.GetCommand(updateSQL, con);
-            updateCmd.ExecuteNonQuery();
-        }
+        using var con = tbl.Database.Server.GetConnection();
+        con.Open();
+        var updateCmd = tbl.Database.Server.GetCommand(updateSQL, con);
+        updateCmd.ExecuteNonQuery();
         var tempFileToCreate = Path.Combine(TestContext.CurrentContext.TestDirectory, "allowList.yaml");
         var allowList = File.Create(tempFileToCreate);
         allowList.Close();
@@ -65,14 +60,9 @@ public void RedactCHIsFromCatalogue_Allowlist()
         var cmd = new ExecuteCommandRedactCHIsFromCatalogue(new ThrowImmediatelyActivator(RepositoryLocator), biochemistry, tempFileToCreate);
         Assert.DoesNotThrow(() => cmd.Execute());
         using var dt = new DataTable();
-        using (var con = tbl.Database.Server.GetConnection())
-        {
-            using (var findCmd = tbl.Database.Server.GetCommand($"select * from {tbl.GetRuntimeName()} where SampleType = 'F#########1'", con))
-            {
-                using var da = tbl.Database.Server.GetDataAdapter(findCmd);
-                da.Fill(dt);
-            }
-        }
+        using (var findCmd = tbl.Database.Server.GetCommand($"select * from {tbl.GetRuntimeName()} where SampleType = 'F#########1'", con))
+        using var da = tbl.Database.Server.GetDataAdapter(findCmd);
+        da.Fill(dt);
         Assert.That(dt.Rows.Count, Is.EqualTo(0));
     }
 }