Part of fix for apache#6590, also depends on apache-superset/superset…

…-ui#71
soboko · Jan 9, 2019 · f55e181 · f55e181
1 parent 1fe0272
commit f55e181
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 8 deletions.
diff --git a/superset/assets/package.json b/superset/assets/package.json
@@ -53,7 +53,7 @@
     "@data-ui/xy-chart": "^0.0.61",
     "@superset-ui/chart": "^0.7.0",
     "@superset-ui/color": "^0.7.0",
-    "@superset-ui/connection": "^0.5.0",
+    "@superset-ui/connection": "^0.7.3",
     "@superset-ui/core": "^0.7.0",
     "@superset-ui/number-format": "^0.7.2",
     "@superset-ui/time-format": "^0.7.2",

diff --git a/superset/assets/spec/javascripts/sqllab/actions/sqlLab_spec.js b/superset/assets/spec/javascripts/sqllab/actions/sqlLab_spec.js
@@ -6,6 +6,8 @@ import * as actions from '../../../../src/SqlLab/actions/sqlLab';
 import { query } from '../fixtures';
 
 describe('async actions', () => {
+  const mockBigNumber = '9223372036854775807';
+
   let dispatch;
 
   beforeEach(() => {
@@ -42,7 +44,7 @@ describe('async actions', () => {
 
   describe('fetchQueryResults', () => {
     const fetchQueryEndpoint = 'glob:*/superset/results/*';
-    fetchMock.get(fetchQueryEndpoint, '{ "data": "" }');
+    fetchMock.get(fetchQueryEndpoint, '{ "data": ' + mockBigNumber + ' }');
 
     const makeRequest = () => {
       const actionThunk = actions.fetchQueryResults(query);
@@ -65,6 +67,13 @@ describe('async actions', () => {
       });
     });
 
+    it('parses large number result without losing precision', () =>
+      makeRequest().then(() => {
+        expect(fetchMock.calls(fetchQueryEndpoint)).toHaveLength(1);
+        expect(dispatch.callCount).toBe(2);
+        expect(dispatch.getCall(1).lastArg.results.data.toString()).toBe(mockBigNumber);
+      }));
+
     it('calls querySuccess on fetch success', () =>
       makeRequest().then(() => {
         expect(dispatch.callCount).toBe(2);
@@ -88,7 +97,7 @@ describe('async actions', () => {
 
   describe('runQuery', () => {
     const runQueryEndpoint = 'glob:*/superset/sql_json/*';
-    fetchMock.post(runQueryEndpoint, { data: '' });
+    fetchMock.post(runQueryEndpoint, '{ "data": ' + mockBigNumber + ' }');
 
     const makeRequest = () => {
       const request = actions.runQuery(query);
@@ -111,6 +120,13 @@ describe('async actions', () => {
       });
     });
 
+    it('parses large number result without losing precision', () =>
+      makeRequest().then(() => {
+        expect(fetchMock.calls(runQueryEndpoint)).toHaveLength(1);
+        expect(dispatch.callCount).toBe(2);
+        expect(dispatch.getCall(1).lastArg.results.data.toString()).toBe(mockBigNumber);
+      }));
+
     it('calls querySuccess on fetch success', () => {
       expect.assertions(3);
 

diff --git a/superset/assets/src/SqlLab/actions/sqlLab.js b/superset/assets/src/SqlLab/actions/sqlLab.js
@@ -111,11 +111,9 @@ export function fetchQueryResults(query) {
 
     return SupersetClient.get({
       endpoint: `/superset/results/${query.resultsKey}/`,
-      parseMethod: 'text',
     })
-      .then(({ text = '{}' }) => {
-        const bigIntJson = JSONbig.parse(text);
-        dispatch(querySuccess(query, bigIntJson));
+      .then(({ json = {} }) => {
+        dispatch(querySuccess(query, json));
       })
       .catch(response =>
         getClientErrorObject(response).then((error) => {

diff --git a/superset/assets/src/components/FilterableTable/FilterableTable.jsx b/superset/assets/src/components/FilterableTable/FilterableTable.jsx
@@ -1,5 +1,6 @@
 import { List } from 'immutable';
 import PropTypes from 'prop-types';
+import JSONbig from 'json-bigint';
 import React, { PureComponent } from 'react';
 import {
   Column,
@@ -85,7 +86,7 @@ export default class FilterableTable extends PureComponent {
         if (['string', 'number'].indexOf(typeof (val)) >= 0) {
           newRow[k] = val;
         } else {
-          newRow[k] = JSON.stringify(val);
+          newRow[k] = JSONbig.stringify(val);
         }
       }
       return newRow;