This is an automated email from the ASF dual-hosted git repository. johnbodley pushed a commit to branch feature--embeddable-charts-pilot in repository https://gitbox.apache.org/repos/asf/incubator-superset.git
commit 4e2b0a8935d35e63ba3f0caa3fa529c357433e58 Author: Conglei Shi <[email protected]> AuthorDate: Wed Dec 5 17:43:44 2018 -0800 rebase --- superset/assets/src/explore/exploreUtils.js | 2 +- superset/common/query_context.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/superset/assets/src/explore/exploreUtils.js b/superset/assets/src/explore/exploreUtils.js index 68b77d0..607dce7 100644 --- a/superset/assets/src/explore/exploreUtils.js +++ b/superset/assets/src/explore/exploreUtils.js @@ -1,7 +1,7 @@ /* eslint camelcase: 0 */ import URI from 'urijs'; -import { availableDomains } from '../utils/hostNamesConfig'; import { getChartBuildQueryRegistry } from '@superset-ui/chart'; +import { availableDomains } from '../utils/hostNamesConfig'; const MAX_URL_LENGTH = 8000; diff --git a/superset/common/query_context.py b/superset/common/query_context.py index cb106f9..f0005c3 100644 --- a/superset/common/query_context.py +++ b/superset/common/query_context.py @@ -108,9 +108,8 @@ class QueryContext: def get_fillna_for_col(self, col): """Returns the value to use as filler for a specific Column.type""" - if col: - if col.is_string: - return ' NULL' + if col and col.is_string: + return ' NULL' return self.default_fillna def get_fillna_for_columns(self, columns=None):
