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.

Sign up for GitHub

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

Jump to bottom

fix: add schema name to datasource field in chart list #11278

Merged
merged 3 commits into from
Oct 15, 2020
Merged

fix: add schema name to datasource field in chart list #11278

Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
de9ff97
fix: add schema name to datasource field in chart list
nytai Oct 14, 2020
a09dffe
pylint
nytai Oct 14, 2020
d67a822
address review feedback
nytai Oct 15, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion superset/models/slice.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,9 +140,15 @@ def datasource_url(self) -> Optional[str]:
def datasource_name_text(self) -> Optional[str]:
# pylint: disable=no-member
if self.table:
if self.table.schema:
return f"{self.table.schema}.{self.table.table_name}"
return self.table.table_name
datasource = self.datasource
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

any reason why we have this here if we're not handling self.table the same way?

I don't really care which we do, but let's be consistent (either table and datasource or self.table and self.datasource)

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

looks like most methods in this model share this inconsistency 😕

return datasource.name if datasource else None
if datasource:
if datasource.schema:
return f"{datasource.schema}.{datasource.name}"
return datasource.name
return None

@property
def datasource_edit_url(self) -> Optional[str]:
Expand Down