superset-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From maximebeauche...@apache.org
Subject [incubator-superset] branch master updated: [explore] fix json highlighting for Druid queries (#4201)
Date Thu, 11 Jan 2018 23:41:31 GMT
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 5916291  [explore] fix json highlighting for Druid queries (#4201)
5916291 is described below

commit 59162919015800b2ffcec8a12495575b4a7029ee
Author: Maxime Beauchemin <maximebeauchemin@gmail.com>
AuthorDate: Thu Jan 11 15:41:28 2018 -0800

    [explore] fix json highlighting for Druid queries (#4201)
---
 superset/assets/javascripts/explore/components/DisplayQueryButton.jsx | 2 ++
 superset/connectors/druid/models.py                                   | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/superset/assets/javascripts/explore/components/DisplayQueryButton.jsx b/superset/assets/javascripts/explore/components/DisplayQueryButton.jsx
index cd93028..fe0cbdd 100644
--- a/superset/assets/javascripts/explore/components/DisplayQueryButton.jsx
+++ b/superset/assets/javascripts/explore/components/DisplayQueryButton.jsx
@@ -4,6 +4,7 @@ import SyntaxHighlighter, { registerLanguage } from 'react-syntax-highlighter/di
 import html from 'react-syntax-highlighter/dist/languages/htmlbars';
 import markdown from 'react-syntax-highlighter/dist/languages/markdown';
 import sql from 'react-syntax-highlighter/dist/languages/sql';
+import json from 'react-syntax-highlighter/dist/languages/json';
 import github from 'react-syntax-highlighter/dist/styles/github';
 import CopyToClipboard from './../../components/CopyToClipboard';
 
@@ -14,6 +15,7 @@ import { t } from '../../locales';
 registerLanguage('markdown', markdown);
 registerLanguage('html', html);
 registerLanguage('sql', sql);
+registerLanguage('json', json);
 
 const $ = window.$ = require('jquery');
 
diff --git a/superset/connectors/druid/models.py b/superset/connectors/druid/models.py
index 4689ef2..308d0b5 100644
--- a/superset/connectors/druid/models.py
+++ b/superset/connectors/druid/models.py
@@ -430,7 +430,7 @@ class DruidDatasource(Model, BaseDatasource):
     __table_args__ = (UniqueConstraint('datasource_name', 'cluster_name'),)
 
     type = 'druid'
-    query_langtage = 'json'
+    query_language = 'json'
     cluster_class = DruidCluster
     metric_class = DruidMetric
     column_class = DruidColumn

-- 
To stop receiving notification emails like this one, please contact
['"commits@superset.apache.org" <commits@superset.apache.org>'].

Mime
View raw message