iop
/
superset
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix(mssql): apply top after distinct (#23751)

This commit is contained in:
Ville Brofeldt 2023-04-21 17:02:59 +03:00 committed by GitHub
parent 0b43112873
commit 764c3c95cf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
superset-frontend/cypress-base/cypress/integration/dataset/dataset_list.test.ts
View File

@ -24,7 +24,7 @@ describe('Dataset list', () => {
cy.visit(DATASET_LIST_PATH);
});
it('should open Explore on dataset name click', () => {
xit('should open Explore on dataset name click', () => {
cy.intercept('**/api/v1/explore/**').as('explore');
cy.get('[data-test="listview-table"] [data-test="internal-link"]')
.contains('birth_names')

3
superset/db_engine_specs/base.py
View File

@ -899,6 +899,9 @@ class BaseEngineSpec: # pylint: disable=too-many-public-methods
if word.upper() in cls.select_keywords
]
first_select = selects[0]
if tokens[first_select + 1].upper() == "DISTINCT":
first_select += 1
tokens.insert(first_select + 1, "TOP")
tokens.insert(first_select + 2, str(final_limit))

1
tests/unit_tests/db_engine_specs/test_mssql.py
View File

@ -257,6 +257,7 @@ select TOP 100 * from currency""",
select TOP 100 * from currency""",
1000,
),
("SELECT DISTINCT x from tbl", "SELECT DISTINCT TOP 100 x from tbl", 100),
("SELECT 1 as cnt", "SELECT TOP 10 1 as cnt", 10),
(
"select TOP 1000 * from abc where id=1",