Get 'Test Connection' button to take 'engine_params' into account (#5830)

This commit is contained in:
Maxime Beauchemin 2018-09-07 14:47:01 -07:00 committed by GitHub
parent 9f4d67b49b
commit 4a62ef3ae0
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 5 additions and 5 deletions

View File

@ -1,7 +1,7 @@
{% macro testconn() %} {% macro testconn() %}
<script> <script>
$("#sqlalchemy_uri").parent() $("#sqlalchemy_uri").parent()
.append('<button id="testconn" class="btn">{{ _("Test Connection") }}</button>'); .append('<button id="testconn" class="btn btn-sm btn-primary">{{ _("Test Connection") }}</button>');
$("#testconn").click(function(e) { $("#testconn").click(function(e) {
e.preventDefault(); e.preventDefault();
var url = "/superset/testconn"; var url = "/superset/testconn";

View File

@ -1701,16 +1701,16 @@ class Superset(BaseSupersetView):
username), username),
) )
connect_args = ( engine_params = (
request.json request.json
.get('extras', {}) .get('extras', {})
.get('engine_params', {}) .get('engine_params', {}))
.get('connect_args', {})) connect_args = engine_params.get('connect_args')
if configuration: if configuration:
connect_args['configuration'] = configuration connect_args['configuration'] = configuration
engine = create_engine(uri, connect_args=connect_args) engine = create_engine(uri, **engine_params)
engine.connect() engine.connect()
return json_success(json.dumps(engine.table_names(), indent=4)) return json_success(json.dumps(engine.table_names(), indent=4))
except Exception as e: except Exception as e: