Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bump HIC.FAnsiSql from 3.2.2 to 3.2.3 #1837

Merged
merged 3 commits into from
May 23, 2024
Merged

Bump HIC.FAnsiSql from 3.2.2 to 3.2.3 #1837

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d5b91ba
Bump HIC.FAnsiSql from 3.2.2 to 3.2.3
dependabot[bot] May 23, 2024
237024d
Update ServerDatabaseTableSelector.cs
jas88 May 23, 2024
1932777
Update DataTableUploadDestinationTests.cs
jas88 May 23, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion Directory.Packages.props
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<PackageVersion Include="ExcelNumberFormat" Version="1.1.0"/>
<PackageVersion Include="FluentFTP" Version="50.0.1"/>
<PackageVersion Include="HIC.SynthEHR" Version="2.0.0"/>
<PackageVersion Include="HIC.FAnsiSql" Version="3.2.2"/>
<PackageVersion Include="HIC.FAnsiSql" Version="3.2.3"/>
<PackageVersion Include="LibArchive.Net" Version="0.1.5"/>
<PackageVersion Include="Microsoft.SourceLink.GitHub" Version="8.0.0">
<PrivateAssets>all</PrivateAssets>
Expand Down
4 changes: 3 additions & 1 deletion Rdmp.Core.Tests/DataLoad/Engine/Integration/DataTableUploadDestinationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
4 changes: 3 additions & 1 deletion Rdmp.UI/SimpleControls/ServerDatabaseTableSelector.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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)
{
Expand Down