This is an automated email from the ASF dual-hosted git repository.
maximebeauchemin pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
The following commit(s) were added to refs/heads/master by this push:
new d1d1c49 Fix raise error when query datasource (#3298)
d1d1c49 is described below
commit d1d1c490094ed3ba08dcef687e9132d3b531581e
Author: Rogan <quang...@gmail.com>
AuthorDate: Thu Aug 17 01:18:43 2017 +0800
Fix raise error when query datasource (#3298)
* Catching the 'NoResultFound' exception when the datasource does't exist
* change one() to first()
* revert modify
* remove import
---
superset/views/core.py | 28 +++++++---------------------
1 file changed, 7 insertions(+), 21 deletions(-)
diff --git a/superset/views/core.py b/superset/views/core.py
index 2088ebd..85aa460 100755
--- a/superset/views/core.py
+++ b/superset/views/core.py
@@ -1039,12 +1039,8 @@ class Superset(BaseSupersetView):
slc = db.session.query(models.Slice).filter_by(id=slice_id).first()
error_redirect = '/slicemodelview/list/'
- datasource = (
- db.session.query(ConnectorRegistry.sources[datasource_type])
- .filter_by(id=datasource_id)
- .one()
- )
-
+ datasource = ConnectorRegistry.get_datasource(
+ datasource_type, datasource_id, db.session)
if not datasource:
flash(DATASOURCE_MISSING_ERR, "danger")
return redirect(error_redirect)
@@ -1119,13 +1115,8 @@ class Superset(BaseSupersetView):
:return:
"""
# TODO: Cache endpoint by user, datasource and column
- datasource_class = ConnectorRegistry.sources[datasource_type]
- datasource = (
- db.session.query(datasource_class)
- .filter_by(id=datasource_id)
- .first()
- )
-
+ datasource = ConnectorRegistry.get_datasource(
+ datasource_type, datasource_id, db.session)
if not datasource:
return json_error_response(DATASOURCE_MISSING_ERR)
if not self.datasource_access(datasource):
@@ -2000,7 +1991,7 @@ class Superset(BaseSupersetView):
schema = request.form.get('schema') or None
session = db.session()
- mydb = session.query(models.Database).filter_by(id=database_id).one()
+ mydb = session.query(models.Database).filter_by(id=database_id).first()
if not mydb:
json_error_response(
@@ -2138,13 +2129,8 @@ class Superset(BaseSupersetView):
def fetch_datasource_metadata(self):
datasource_id, datasource_type = (
request.args.get('datasourceKey').split('__'))
- datasource_class = ConnectorRegistry.sources[datasource_type]
- datasource = (
- db.session.query(datasource_class)
- .filter_by(id=int(datasource_id))
- .first()
- )
-
+ datasource = ConnectorRegistry.get_datasource(
+ datasource_type, datasource_id, db.session)
# Check if datasource exists
if not datasource:
return json_error_response(DATASOURCE_MISSING_ERR)
--
To stop receiving notification emails like this one, please contact
['"comm...@superset.apache.org" <comm...@superset.apache.org>'].
