(superset) branch master updated: fix(drilling): drill by pagination works with MSSQL data source, cont. (#34724)

[rusackas]

This is an automated email from the ASF dual-hosted git repository.

rusackas pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/superset.git


The following commit(s) were added to refs/heads/master by this push:
     new c5a84c0985 fix(drilling): drill by pagination works with MSSQL data 
source, cont. (#34724)
c5a84c0985 is described below

commit c5a84c098516240ecc37b3d82f2262beeb963416
Author: Sam Firke <sfi...@users.noreply.github.com>
AuthorDate: Fri Aug 29 15:23:59 2025 -0400

    fix(drilling): drill by pagination works with MSSQL data source, cont. 
(#34724)
---
 .../cypress-base/cypress/e2e/dashboard/drilltodetail.test.ts          | 4 ++--
 superset/common/query_actions.py                                      | 2 +-
 superset/superset_typing.py                                           | 2 +-
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git 
a/superset-frontend/cypress-base/cypress/e2e/dashboard/drilltodetail.test.ts 
b/superset-frontend/cypress-base/cypress/e2e/dashboard/drilltodetail.test.ts
index e6f882beb0..7bff782c49 100644
--- a/superset-frontend/cypress-base/cypress/e2e/dashboard/drilltodetail.test.ts
+++ b/superset-frontend/cypress-base/cypress/e2e/dashboard/drilltodetail.test.ts
@@ -179,13 +179,13 @@ describe.skip('Drill to detail modal', () => {
         cy.on('uncaught:exception', () => false);
         cy.wait('@samples');
         cy.get('.virtual-table-cell').should($rows => {
-          expect($rows).to.contain('Kelly');
+          expect($rows).to.contain('Kimberly');
         });
 
         // verify scroll top on pagination
         cy.getBySelLike('Number-modal').find('.virtual-grid').scrollTo(0, 200);
 
-        cy.get('.virtual-grid').contains('Juan').should('not.be.visible');
+        cy.get('.virtual-grid').contains('Kim').should('not.be.visible');
 
         cy.get('.ant-pagination-item').eq(0).click();
 
diff --git a/superset/common/query_actions.py b/superset/common/query_actions.py
index 694973a47a..a18e40a66b 100644
--- a/superset/common/query_actions.py
+++ b/superset/common/query_actions.py
@@ -167,7 +167,6 @@ def _get_drill_detail(
     datasource = _get_datasource(query_context, query_obj)
     query_obj = copy.copy(query_obj)
     query_obj.is_timeseries = False
-    query_obj.orderby = []
     query_obj.metrics = None
     query_obj.post_processing = []
     qry_obj_cols = []
@@ -177,6 +176,7 @@ def _get_drill_detail(
         else:
             qry_obj_cols.append(o.column_name)
     query_obj.columns = qry_obj_cols
+    query_obj.orderby = [(query_obj.columns[0], True)]
     return _get_full(query_context, query_obj, force_cached)
 
 
diff --git a/superset/superset_typing.py b/superset/superset_typing.py
index c3c40cd31a..02a4a32f24 100644
--- a/superset/superset_typing.py
+++ b/superset/superset_typing.py
@@ -108,7 +108,7 @@ FormData = dict[str, Any]
 Granularity = Union[str, dict[str, Union[str, float]]]
 Column = Union[AdhocColumn, str]
 Metric = Union[AdhocMetric, str]
-OrderBy = tuple[Metric, bool]
+OrderBy = tuple[Union[Metric, Column], bool]
 QueryObjectDict = dict[str, Any]
 VizData = Optional[Union[list[Any], dict[Any, Any]]]
 VizPayload = dict[str, Any]