diff --git a/Directory.Packages.props b/Directory.Packages.props index 95980c3997..2ce5d70c80 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -5,7 +5,7 @@ - + all diff --git a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataTableUploadDestinationTests.cs b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataTableUploadDestinationTests.cs index 17a8f8d52c..758604e6c5 100644 --- a/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataTableUploadDestinationTests.cs +++ b/Rdmp.Core.Tests/DataLoad/Engine/Integration/DataTableUploadDestinationTests.cs @@ -1251,7 +1251,9 @@ public void TwoBatch_BooleanResizingTest(DatabaseType dbType, bool giveNullValue destination.ProcessPipelineData(dt1, toConsole, token); - Assert.That(db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("TestedCol").DataType.SQLType, Is.EqualTo("bit")); + // MS SQL is odd and uses "bit" as a boolean, MySQL has a boolean type but aliases it to tinyint(1) + Assert.That(db.ExpectTable("DataTableUploadDestinationTests").DiscoverColumn("TestedCol").DataType?.SQLType, + Is.EqualTo(dbType == DatabaseType.MicrosoftSQLServer ? "bit" : "tinyint(1)")); destination.ProcessPipelineData(dt2, toMemory, token); diff --git a/Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.cs b/Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.cs index c2b62d1993..150217a752 100644 --- a/Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.cs +++ b/Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.cs @@ -10,6 +10,7 @@ using System.Data.Common; using System.Linq; using System.Threading; +using System.Threading.Tasks; using System.Windows.Forms; using FAnsi; using FAnsi.Discovery; @@ -189,7 +190,8 @@ private void UpdateDatabaseListAsync(object sender, DoWorkEventArgs e) _workerRefreshDatabasesToken = new CancellationTokenSource(); try { - _listDatabasesAsyncResult = _helper.ListDatabasesAsync(builder, _workerRefreshDatabasesToken.Token); + _listDatabasesAsyncResult = _helper.ListDatabasesAsync(builder, _workerRefreshDatabasesToken.Token) + .ToBlockingEnumerable(_workerRefreshDatabasesToken.Token).ToArray(); } catch (OperationCanceledException) {