fix: allow adhoc columns in non-aggregate query #21729

mayurnewase · 2022-10-07T04:36:08Z

SUMMARY

fixes: #21689
regression from : #19454

BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF

TESTING INSTRUCTIONS

ADDITIONAL INFORMATION

Has associated issue:
Required feature flags:
Changes UI
Includes DB Migration (follow approval process in SIP-59)
- Migration is atomic, supports rollback & is backwards-compatible
- Confirm DB migration upgrade and downgrade tested
- Runtime estimates and downtime expectations provided
Introduces new feature or API
Removes existing feature or API

superset/connectors/sqla/models.py

superset/superset_typing.py

codecov · 2022-10-07T04:43:10Z

Codecov Report

Merging #21729 (4a6eaa8) into master (97273f5) will increase coverage by 0.01%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master   #21729      +/-   ##
==========================================
+ Coverage   66.85%   66.86%   +0.01%     
==========================================
  Files        1799     1799              
  Lines       68887    68906      +19     
  Branches     7320     7320              
==========================================
+ Hits        46052    46072      +20     
+ Misses      20946    20945       -1     
  Partials     1889     1889

Flag	Coverage Δ
hive	`52.93% <100.00%> (+0.01%)`	⬆️
mysql	`78.25% <100.00%> (+<0.01%)`	⬆️
postgres	`78.31% <100.00%> (+<0.01%)`	⬆️
presto	`52.83% <100.00%> (+0.01%)`	⬆️
python	`81.46% <100.00%> (+0.01%)`	⬆️
sqlite	`76.80% <100.00%> (-0.01%)`	⬇️
unit	`51.05% <77.77%> (+0.09%)`	⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Impacted Files	Coverage Δ
superset/connectors/sqla/models.py	`90.73% <100.00%> (+0.04%)`	⬆️
superset/superset_typing.py	`98.18% <100.00%> (ø)`
superset/utils/core.py	`90.32% <100.00%> (ø)`
superset/db_engine_specs/gsheets.py	`75.91% <0.00%> (-0.21%)`	⬇️
superset/queries/saved_queries/api.py	`95.28% <0.00%> (ø)`
superset/databases/schemas.py	`98.23% <0.00%> (+<0.01%)`	⬆️
superset/config.py	`91.63% <0.00%> (+0.02%)`	⬆️
superset/models/sql_lab.py	`74.80% <0.00%> (+0.09%)`	⬆️
superset/datasets/api.py	`87.39% <0.00%> (+0.10%)`	⬆️
superset/db_engine_specs/__init__.py	`85.71% <0.00%> (+0.90%)`	⬆️
... and 1 more

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

zhaoyongjie

leave a comment for code convention.

superset/connectors/sqla/models.py

mayurnewase · 2022-10-08T00:55:15Z

thanks for review, will update today.

superset/connectors/sqla/models.py

tests/integration_tests/charts/data/api_tests.py

zhaoyongjie · 2022-10-10T03:46:13Z

/testenv up

github-actions · 2022-10-10T03:48:12Z

@zhaoyongjie Ephemeral environment spinning up at http://54.188.110.15:8080. Credentials are admin/admin. Please allow several minutes for bootstrapping and startup.

zhaoyongjie

work as expected.

mayurnewase · 2022-10-10T04:04:53Z

thanks for review and testing ...

john-bodley · 2022-11-08T14:55:00Z

superset/connectors/sqla/models.py

@@ -119,6 +119,7 @@
 from superset.superset_typing import (
    AdhocColumn,
    AdhocMetric,
+    Column as ColumnTyping,


@mayurnewase out of interest why did you rename this? There doesn't seem to be a name clash per your change.

@john-bodley there is import of Column from sqlalchemy on line 50.

mayurnewase · 2022-11-08T17:10:26Z

I think this PR also needs to go in v1.5 as ville tagged corresponding issue for 1.5.
I don't know who is the release manager here, so maybe ping @michael-s-molina

michael-s-molina · 2022-11-08T18:55:40Z

I think this PR also needs to go in v1.5 as ville tagged corresponding issue for 1.5. I don't know who is the release manager here, so maybe ping @michael-s-molina

I added the v1.5 label. Let's see if it merges cleanly.

mayurnewase added 7 commits October 7, 2022 09:57

fix and test

4e7e5f4

fix and test

2dd16ff

fix and test

fb02219

fix and test

1efc993

fix and test

17d1023

fix and test

c13bb65

fix and test

0c81645

pull-request-size bot added the size/L label Oct 7, 2022

mayurnewase marked this pull request as ready for review October 7, 2022 04:36

mayurnewase commented Oct 7, 2022

View reviewed changes

superset/connectors/sqla/models.py Outdated Show resolved Hide resolved

mayurnewase commented Oct 7, 2022

View reviewed changes

superset/superset_typing.py Show resolved Hide resolved

zhaoyongjie reviewed Oct 7, 2022

View reviewed changes

superset/connectors/sqla/models.py Outdated Show resolved Hide resolved

superset/connectors/sqla/models.py Outdated Show resolved Hide resolved

mayurnewase added 3 commits October 8, 2022 23:55

update typing

b66fa51

update typing

c106fb1

update typing

c8b20b8

pull-request-size bot added size/M and removed size/L labels Oct 8, 2022

mayurnewase commented Oct 8, 2022

View reviewed changes

superset/connectors/sqla/models.py Outdated Show resolved Hide resolved

zhaoyongjie reviewed Oct 8, 2022

View reviewed changes

superset/connectors/sqla/models.py Outdated Show resolved Hide resolved

superset/connectors/sqla/models.py Outdated Show resolved Hide resolved

superset/connectors/sqla/models.py Outdated Show resolved Hide resolved

zhaoyongjie reviewed Oct 8, 2022

View reviewed changes

tests/integration_tests/charts/data/api_tests.py Show resolved Hide resolved

revision 2

4a6eaa8

mayurnewase requested a review from zhaoyongjie October 10, 2022 02:09

zhaoyongjie approved these changes Oct 10, 2022

View reviewed changes

zhaoyongjie changed the title ~~fix: allow adhoc query in chart columns~~ fix: allow adhoc columns in non-aggregate query Oct 10, 2022

zhaoyongjie merged commit d1a6f0e into apache:master Oct 10, 2022

eschutho added v2.0 v2.0.1 labels Oct 13, 2022

codyml mentioned this pull request Oct 14, 2022

fix(backend): DB engine Error when trying to create custom SQL Column #21279

Closed

9 tasks

eschutho pushed a commit to preset-io/superset that referenced this pull request Oct 18, 2022

fix: allow adhoc columns in non-aggregate query (apache#21729)

8432c64

john-bodley reviewed Nov 8, 2022

View reviewed changes

mayurnewase deleted the fix-21689 branch November 8, 2022 17:14

michael-s-molina added the v1.5 label Nov 8, 2022

Fahrenheit35 pushed a commit to Fahrenheit35/superset that referenced this pull request Nov 11, 2022

fix: allow adhoc columns in non-aggregate query (apache#21729)

b950046

AAfghahi pushed a commit that referenced this pull request Nov 17, 2022

fix: allow adhoc columns in non-aggregate query (#21729)

1c5290e

AAfghahi pushed a commit that referenced this pull request Nov 18, 2022

fix: allow adhoc columns in non-aggregate query (#21729)

b43c047

AAfghahi pushed a commit that referenced this pull request Nov 18, 2022

fix: allow adhoc columns in non-aggregate query (#21729)

11a40a4

AAfghahi pushed a commit that referenced this pull request Dec 15, 2022

fix: allow adhoc columns in non-aggregate query (#21729)

bac190e

AAfghahi pushed a commit that referenced this pull request Dec 15, 2022

fix: allow adhoc columns in non-aggregate query (#21729)

c9921f8

michael-s-molina pushed a commit that referenced this pull request Jan 5, 2023

fix: allow adhoc columns in non-aggregate query (#21729)

f676a89

mistercrunch added 🍒 2.0.1 🚢 2.1.0 🍒 1.5.3 🚢 2.1.3 and removed 🍒 2.0.1 🍒 1.5.3 🚢 2.1.3 🚢 2.1.0 labels Feb 18, 2024

mistercrunch added 🍒 1.5.3 🍒 2.0.1 🏷️ bot A label used by `supersetbot` to keep track of which PR where auto-tagged with release labels 🚢 2.1.0 and removed 🚢 2.1.3 labels Mar 13, 2024

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

fix: allow adhoc columns in non-aggregate query #21729

fix: allow adhoc columns in non-aggregate query #21729

mayurnewase commented Oct 7, 2022 •

edited

Loading

codecov bot commented Oct 7, 2022 •

edited

Loading

zhaoyongjie left a comment

mayurnewase commented Oct 8, 2022

zhaoyongjie commented Oct 10, 2022

github-actions bot commented Oct 10, 2022

zhaoyongjie left a comment

mayurnewase commented Oct 10, 2022

john-bodley Nov 8, 2022

mayurnewase Nov 8, 2022

mayurnewase commented Nov 8, 2022

michael-s-molina commented Nov 8, 2022

fix: allow adhoc columns in non-aggregate query #21729

fix: allow adhoc columns in non-aggregate query #21729

Conversation

mayurnewase commented Oct 7, 2022 • edited Loading

SUMMARY

BEFORE/AFTER SCREENSHOTS OR ANIMATED GIF

TESTING INSTRUCTIONS

ADDITIONAL INFORMATION

codecov bot commented Oct 7, 2022 • edited Loading

Codecov Report

zhaoyongjie left a comment

Choose a reason for hiding this comment

mayurnewase commented Oct 8, 2022

zhaoyongjie commented Oct 10, 2022

github-actions bot commented Oct 10, 2022

zhaoyongjie left a comment

Choose a reason for hiding this comment

mayurnewase commented Oct 10, 2022

john-bodley Nov 8, 2022

Choose a reason for hiding this comment

mayurnewase Nov 8, 2022

Choose a reason for hiding this comment

mayurnewase commented Nov 8, 2022

michael-s-molina commented Nov 8, 2022

mayurnewase commented Oct 7, 2022 •

edited

Loading

codecov bot commented Oct 7, 2022 •

edited

Loading