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.

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

Bugfix/RDMP-266 Fix Issue with Cross-Database SQL Viewing #2059

Merged
merged 11 commits into from
Nov 11, 2024
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
- Add Ordering to Filters
- Fix Delta Load off by one issue
- Update Migration strategy to account for all Primary Keys when moving from staging -> live
- Fix UI issue with viewing cross-database SQL results

## [8.3.1] - 2024-10-22

Expand Down
12 changes: 6 additions & 6 deletions Directory.Packages.props
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<Project>
<ItemGroup>
<PackageVersion Include="AWSSDK.S3" Version="3.7.405.6" />
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.400.42" />
<PackageVersion Include="AWSSDK.SSO" Version="3.7.400.42" />
<PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.42" />
<PackageVersion Include="AWSSDK.S3" Version="3.7.405.11" />
<PackageVersion Include="AWSSDK.SecurityToken" Version="3.7.400.47" />
<PackageVersion Include="AWSSDK.SSO" Version="3.7.400.47" />
<PackageVersion Include="AWSSDK.SSOOIDC" Version="3.7.400.47" />
<PackageVersion Include="CommandLineParser" Version="2.9.1" />
<PackageVersion Include="Equ" Version="2.3.0" />
<PackageVersion Include="ExcelNumberFormat" Version="1.1.0" />
Expand All @@ -18,14 +18,14 @@
<PackageVersion Include="Minio" Version="6.0.3" />
<PackageVersion Include="MongoDB.Driver" Version="3.0.0" />
<PackageVersion Include="Newtonsoft.Json" Version="13.0.3" />
<PackageVersion Include="NPOI" Version="2.7.1" />
<PackageVersion Include="NPOI" Version="2.7.2" />
<PackageVersion Include="NLog" Version="5.3.4" />
<PackageVersion Include="SixLabors.ImageSharp" Version="3.1.5" />
<PackageVersion Include="SixLabors.ImageSharp.Drawing" Version="2.1.4" />
<PackageVersion Include="Spectre.Console" Version="0.49.1" />
<PackageVersion Include="SSH.NET" Version="2024.1.0" />
<PackageVersion Include="Terminal.Gui" Version="1.17.1" />
<PackageVersion Include="YamlDotNet" Version="16.1.3" />
<PackageVersion Include="YamlDotNet" Version="16.2.0" />
<PackageVersion Include="ConsoleControl" Version="1.3.0" />
<PackageVersion Include="Autoupdater.NET.Official" Version="1.9.2" />
<PackageVersion Include="DockPanelSuite.ThemeVS2015" Version="3.1.1" />
Expand Down
3 changes: 2 additions & 1 deletion Rdmp.UI/DataViewing/ViewSQLAndResultsWithDataGridUI.cs
Original file line number Diff line number Diff line change
Expand Up @@ -167,8 +167,9 @@ private void RefreshUIFromDatabase()
{
try
{
var dbAccessPoint = _collection.GetDataAccessPoint();
_server = DataAccessPortal
.ExpectServer(_collection.GetDataAccessPoint(), DataAccessContext.InternalDataProcessing);
.ExpectServer(dbAccessPoint, DataAccessContext.InternalDataProcessing, dbAccessPoint.Database != null);

var sql = _collection.GetSql();
_originalSql = sql;
Expand Down