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

Fix database typeahead in SQL Lab (#6917) 

* Fix database typeahead in SQL Lab

* Fix lint

* Use string interpolation
This commit is contained in:
Beto Dealmeida 2019-02-19 16:10:17 -08:00 committed by Christine Chambers
parent 3f96b0c5c4
commit 25ec00b3c6
2 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
superset/assets/src/components/TableSelector.jsx
View File

@ -111,7 +111,11 @@ export default class TableSelector extends React.PureComponent {
if (data.result.length === 0) {
this.props.handleError(t("It seems you don't have access to any database"));
}
return data.result;
return data.result.map(row => ({
...row,
// label is used for the typeahead
label: `${row.backend} ${row.database_name}`,
}));
}
fetchTables(force, substr) {
// This can be large so it shouldn't be put in the Redux store

15
superset/views/core.py
View File

@ -1524,12 +1524,17 @@ class Superset(BaseSupersetView):
db.session
.query(models.Database)
.filter_by(id=db_id)
.one()
.first()
)
schemas = database.all_schema_names(cache=database.schema_cache_enabled,
cache_timeout=database.schema_cache_timeout,
force=force_refresh)
schemas = security_manager.schemas_accessible_by_user(database, schemas)
if database:
schemas = database.all_schema_names(
cache=database.schema_cache_enabled,
cache_timeout=database.schema_cache_timeout,
force=force_refresh)
schemas = security_manager.schemas_accessible_by_user(database, schemas)
else:
schemas = []
return Response(
json.dumps({'schemas': schemas}),
mimetype='application/json')