Merge pull request #2059 from HicServices/bugfix/RDMP-266-multi-db-joins

Bugfix/RDMP-266 Fix Issue with Cross-Database SQL Viewing
HicServices · Nov 11, 2024 · f146d9a · f146d9a
2 parents 6687ab1 + 9e461f7
commit f146d9a
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -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
 

diff --git a/Rdmp.UI/DataViewing/ViewSQLAndResultsWithDataGridUI.cs b/Rdmp.UI/DataViewing/ViewSQLAndResultsWithDataGridUI.cs
@@ -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;