QT/superset2
1
0
Fork 0
mirror of https://github.com/apache/superset.git synced 2026-04-19 08:04:53 +00:00
Code Issues Packages Projects Releases Wiki Activity

Don't die on malformed json in the extras field. Give feedback to user (#338)

Browse Source
This commit is contained in:
Denis Zgonjanin
2016-04-13 19:41:55 -04:00
committed by Maxime Beauchemin
parent 1e08b3e8c5
commit 8fe5790ec3
2 changed files with 13 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
caravel/templates/caravel/models/database/macros.html
View File

@@ -2,12 +2,22 @@
<script>
$("#sqlalchemy_uri").parent()
.append('<button id="testconn" class="btn">Test Connection</button>');
$("#testconn").click(function() {
$("#testconn").click(function(e) {
e.preventDefault();
var url = "/caravel/testconn";
var data = {};
try{
data = JSON.stringify({ uri: $("#sqlalchemy_uri").val(), extras: JSON.parse($("#extra").val()) })
} catch(parse_error){
alert("Malformed JSON in the extras field: " + parse_error);
return false
}
$.ajax({
method: "POST",
url: url,
data: JSON.stringify({ uri: $("#sqlalchemy_uri").val(), extras: JSON.parse($("#extra").val()) }),
data: data,
dataType: 'json',
contentType: "application/json; charset=utf-8"
}).done(function(data) {

2
caravel/views.py
View File

@@ -638,7 +638,7 @@ class Caravel(BaseView):
"""Tests a sqla connection"""
try:
uri = request.json.get('uri')
connect_args = request.json.get('extras', {}).get('engine_params', {}).get('connect_args')
connect_args = request.json.get('extras', {}).get('engine_params', {}).get('connect_args', {})
engine = create_engine(uri, connect_args=connect_args)
engine.connect()
return json.dumps(engine.table_names(), indent=4)