sea-chart 0.0.30 → 0.0.31-beta

package/dist/utils/sql/chart-data-sql.js

@@ -1,6 +1,6 @@
 import { CellType, filter2SqlCondition, isNumericColumn, isDateColumn } from 'dtable-utils';
 import { getSqlGroup } from '../column-utils';
-import { CHART_TYPE, DTABLE_DB_SUMMARY_METHOD, CHART_SUMMARY_TYPE, TIME_COLUMN_LIST, Y_AXIS_TYPE_PREFIX, CHART_Y_GROUP_TYPE } from '../../constants';
+import { CHART_TYPE, DTABLE_DB_SUMMARY_METHOD, CHART_SUMMARY_TYPE, CHART_Y_GROUP_TYPE } from '../../constants';
 import { fixGeoGranularity } from '../map';
 
 /*
@@ -16,33 +16,36 @@ class ChartDataSQL {
       userId,
       userDepartmentIdsMap
     } = _ref;
+    this._chart_column_name_to_sql = (column, groupBy) => {
+      return getSqlGroup(column, groupBy);
+    };
     this._get_column_by_key = key => {
-      return this.columnKeyMap[key];
+      return this.column_key_map[key];
     };
     this._get_sql_order_by = (sortType, groupName) => {
       if (!sortType) {
-        return "order by ".concat(groupName);
+        return "ORDER BY ".concat(groupName);
       }
       return '';
     };
-    this._update_filter_sql = (includeEmpty, column, method) => {
-      const columnName = (column === null || column === void 0 ? void 0 : column.name) || '';
-      if (!includeEmpty) {
-        const sqlColumnName = method ? "".concat(method, "(`").concat(columnName, "`)") : "`".concat(columnName, "`");
-        const notIncludeEmptySQL = "".concat(sqlColumnName, " IS NOT NULL");
+    this._update_filter_sql = (include_empty, column, method) => {
+      const column_name = (column === null || column === void 0 ? void 0 : column.name) || '';
+      if (!include_empty) {
+        const sql_column_name = method ? "".concat(method, "(`").concat(column_name, "`)") : "`".concat(column_name, "`");
+        const not_include_empty_sql = "".concat(sql_column_name, " IS NOT NULL");
         if (this.filter_sql) {
-          this.filter_sql = "WHERE ".concat(notIncludeEmptySQL, " AND ").concat(this.filter_sql);
+          this.filter_sql = "WHERE ".concat(not_include_empty_sql, " AND ").concat(this.filter_sql);
         } else {
-          this.filter_sql = "WHERE ".concat(notIncludeEmptySQL);
+          this.filter_sql = "WHERE ".concat(not_include_empty_sql);
         }
       }
     };
     this._summary_column_2_sql = (summary_method, column) => {
-      const columnName = (column === null || column === void 0 ? void 0 : column.name) || '';
-      const validColumnName = "".concat(columnName);
-      if (summary_method === 'DISTINCT_VALUES') return "COUNT(DISTINCT ".concat(validColumnName, ")");
-      if (summary_method === 'ROW_COUNT') return "COUNT(".concat(validColumnName, ")");
-      return "".concat(DTABLE_DB_SUMMARY_METHOD[summary_method], "(").concat(validColumnName, ")");
+      const column_name = (column === null || column === void 0 ? void 0 : column.name) || '';
+      const valid_column_name = "`".concat(column_name, "`");
+      if (summary_method === 'DISTINCT_VALUES') return "COUNT(DISTINCT ".concat(valid_column_name, ")");
+      if (summary_method === 'ROW_COUNT') return "COUNT(".concat(valid_column_name, ")");
+      return "".concat(DTABLE_DB_SUMMARY_METHOD[summary_method], "(").concat(valid_column_name, ")");
     };
     this._basic_statistic_2_sql = () => {
       let x_axis_column_key, x_axis_date_granularity, x_axis_geolocation_granularity, x_axis_include_empty_cells, y_axis_summary_type, y_axis_summary_method, y_axis_summary_column_key;
@@ -63,13 +66,13 @@ class ChartDataSQL {
         y_axis_summary_method = this.chart['y_axis_summary_method'] || '';
         y_axis_summary_column_key = this.chart['y_axis_summary_column_key'] || '';
       }
-      const groupby_column = this.columnKeyMap[x_axis_column_key];
+      const groupby_column = this._get_column_by_key(x_axis_column_key);
       if (!groupby_column) {
         this.error = 'Group_by_column_not_found';
         return '';
       }
       this._update_filter_sql(x_axis_include_empty_cells, groupby_column);
-      const groupby_column_name = getSqlGroup(groupby_column, {
+      const groupby_column_name = this._chart_column_name_to_sql(groupby_column, {
         'date_granularity': x_axis_date_granularity,
         'geolocation_granularity': x_axis_geolocation_granularity
       });
@@ -80,7 +83,7 @@ class ChartDataSQL {
       if (summary_type === 'COUNT') {
         summary_column_name = this._summary_column_2_sql('COUNT', groupby_column);
       } else {
-        summary_column = this.columnKeyMap[y_axis_summary_column_key];
+        summary_column = this._get_column_by_key(y_axis_summary_column_key);
         if (summary_column) {
           summary_method = y_axis_summary_method.toUpperCase();
           summary_column_name = this._summary_column_2_sql(summary_method, summary_column);
@@ -98,30 +101,23 @@ class ChartDataSQL {
         summary_method,
         summary_column_key
       } = this.chart;
-      const selectedTable = this.table;
-      const groupby_column = this.columnKeyMap[time_column_key];
+      const groupby_column = this._get_column_by_key(time_column_key);
       if (!groupby_column) {
-        this.error = 'Group by column not found';
+        this.error = 'Group_by_column_not_found';
         return '';
       }
-      const columnName = groupby_column.name;
-      const isAdvanced = summary_type === CHART_SUMMARY_TYPE.ADVANCED;
-      const method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[summary_method] : 'COUNT';
       this._update_filter_sql(true, groupby_column);
-      let summaryColumn;
-      let sqlString = '';
-      if (isAdvanced) {
-        summaryColumn = this.columnKeyMap[summary_column_key];
-        if (!summaryColumn) {
-          this.error = 'Summary column not found';
+      const column_name = this._chart_column_name_to_sql(groupby_column, {});
+      let summary_column_name = this._summary_column_2_sql('COUNT', groupby_column);
+      if (summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
+        const summary_column = this._get_column_by_key(summary_column_key);
+        if (!summary_column) {
+          this.error = 'Summary_column_not_found';
           return '';
         }
-        const summaryColumnMethod = this._summary_column_2_sql(summary_method.toUpperCase(), summaryColumn);
-        sqlString = "select `".concat(columnName, "`, ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(this.filter_sql, " group by `").concat(columnName, "` limit 5000");
-      } else {
-        sqlString = "select `".concat(columnName, "`, ").concat(method, "(").concat(columnName, ") from `").concat(selectedTable.name, "` ").concat(this.filter_sql, " group by `").concat(columnName, "` limit 5000");
+        summary_column_name = this._summary_column_2_sql(summary_method.toUpperCase(), summary_column);
       }
-      return sqlString;
+      return "SELECT ".concat(column_name, ", ").concat(summary_column_name, " FROM `").concat(this.table_name, "` ").concat(this.filter_sql, " GROUP BY ").concat(column_name, " LIMIT 0, 5000");
     };
     this._mirror_map_statistic_2_sql = () => {
       const {
@@ -131,62 +127,57 @@ class ChartDataSQL {
         summary_column_key,
         group_column_key
       } = this.chart;
-      const selectedTable = this.table;
-      let sqlString = '';
-      const x_groupby_column = this.columnKeyMap[column_key];
-      if (!x_groupby_column) {
-        this.error = 'X Group by column not found';
+      const groupby_column = this._get_column_by_key(column_key);
+      if (!groupby_column) {
+        this.error = 'Group_by_column_not_found';
         return '';
       }
-      const y_groupby_column = this.columnKeyMap[group_column_key];
-      if (!y_groupby_column) {
-        this.error = 'Y Group by column not found';
+      const column_groupby_column = this._get_column_by_key(group_column_key);
+      if (!column_groupby_column) {
+        this.error = 'Column_group_by_column_not_found';
         return '';
       }
-      const columnName = x_groupby_column.name;
-      const groupColumnName = y_groupby_column.name;
-      const isAdvanced = summary_type === CHART_SUMMARY_TYPE.ADVANCED;
-      const method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[summary_method] : 'COUNT';
-      this._update_filter_sql(true, x_groupby_column);
-      let summaryColumn;
-      if (isAdvanced) {
-        summaryColumn = this.columnKeyMap[summary_column_key];
-        if (!summaryColumn) {
-          return [];
+      this._update_filter_sql(true, groupby_column);
+      const column_name = this._chart_column_name_to_sql(groupby_column, {});
+      const column_groupby_column_name = this._chart_column_name_to_sql(column_groupby_column, {});
+      let summary_column_name = this._summary_column_2_sql('COUNT', groupby_column);
+      if (summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
+        const summary_column = this._get_column_by_key(summary_column_key);
+        if (!summary_column) {
+          this.error = 'Summary_column_not_found';
+          return '';
         }
-        const summaryColumnMethod = this._summary_column_2_sql(summary_method.toUpperCase(), summaryColumn);
-        sqlString = "select `".concat(columnName, "`, `").concat(groupColumnName, "`, ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(this.filter_sql, " group by `").concat(columnName, "`, `").concat(groupColumnName, "` limit 5000");
-      } else {
-        sqlString = "select `".concat(columnName, "`, `").concat(groupColumnName, "`, ").concat(method, "(`").concat(columnName, "`) from `").concat(selectedTable.name, "` ").concat(this.filter_sql, " group by `").concat(columnName, "`, `").concat(groupColumnName, "` limit 5000");
+        summary_column_name = this._summary_column_2_sql(summary_method.toUpperCase(), summary_column);
       }
-      return sqlString;
+      return "SELECT ".concat(column_name, ", ").concat(column_groupby_column_name, ", ").concat(summary_column_name, " FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY ").concat(column_name, ", ").concat(column_groupby_column_name, " LIMIT 0, 5000");
     };
     this._trend_map_statistic_2_sql = () => {
       const {
         date_column_key,
         summary_type,
         summary_method,
-        date_granularity
+        date_granularity,
+        summary_column_key
       } = this.chart;
-      const selectedTable = this.table;
-      const groupby_column = this.columnKeyMap[date_column_key];
+      const groupby_column = this._get_column_by_key(date_column_key);
       if (!groupby_column) {
-        this.error = 'X Group by column not found';
+        this.error = 'Group_by_column_not_found';
         return '';
       }
-      const columnName = groupby_column.name;
       this._update_filter_sql(true, groupby_column);
-      const dateGroupBy = getSqlGroup(groupby_column, {
+      const groupby_column_name = this._chart_column_name_to_sql(groupby_column, {
         'date_granularity': date_granularity
       });
-      let sqlString = '';
-      if (summary_type === CHART_SUMMARY_TYPE.COUNT) {
-        sqlString = "select ".concat(dateGroupBy, ", ").concat(DTABLE_DB_SUMMARY_METHOD.ROW_COUNT, "(").concat(columnName, ") from `").concat(selectedTable.name, "` ").concat(this.filter_sql, " group by ").concat(dateGroupBy, " order by ").concat(dateGroupBy, " limit 5000");
-      } else {
-        const summaryColumnMethod = DTABLE_DB_SUMMARY_METHOD[summary_method];
-        sqlString = "select ".concat(dateGroupBy, ", ").concat(summaryColumnMethod, " from `").concat(selectedTable.name, "` ").concat(this.filter_sql, " group by ").concat(dateGroupBy, " order by ").concat(dateGroupBy, " limit 5000");
+      let summary_column_name = this._summary_column_2_sql('COUNT', groupby_column);
+      if (summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
+        const summary_column = this._get_column_by_key(summary_column_key);
+        if (!summary_column) {
+          this.error = 'Summary_column_not_found';
+          return '';
+        }
+        summary_column_name = this._summary_column_2_sql(summary_method.toUpperCase(), summary_column);
       }
-      return sqlString;
+      return "SELECT ".concat(groupby_column_name, ", ").concat(summary_column_name, " FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY ").concat(groupby_column_name, " LIMIT 0, 5000");
     };
     this._grouping_statistic_2_sql = () => {
       let x_axis_column_key, x_axis_date_granularity, x_axis_geolocation_granularity, x_axis_include_empty_cells, y_axis_summary_type, y_axis_summary_method, y_axis_summary_column_key;
@@ -212,21 +203,21 @@ class ChartDataSQL {
       const column_groupby_geolocation_granularity = this.chart['column_groupby_geolocation_granularity'] || '';
       const column_groupby_multiple_numeric_column = this.chart['column_groupby_multiple_numeric_column'] || false;
       const summary_columns = this.chart['summary_columns'] || [];
-      const groupby_column = this.columnKeyMap[x_axis_column_key];
+      const groupby_column = this._get_column_by_key(x_axis_column_key);
       if (!groupby_column) {
         this.error = 'Group_by_column_not_found';
         return '';
       }
       this._update_filter_sql(x_axis_include_empty_cells, groupby_column);
-      const groupby_column_name = getSqlGroup(groupby_column, {
+      const groupby_column_name = this._chart_column_name_to_sql(groupby_column, {
         'date_granularity': x_axis_date_granularity,
         'geolocation_granularity': x_axis_geolocation_granularity
       });
       const summary_type = y_axis_summary_type.toUpperCase();
       if (summary_type === 'COUNT') {
-        const column_groupby_column = this.columnKeyMap[column_groupby_column_key];
+        const column_groupby_column = this._get_column_by_key(column_groupby_column_key);
         if (!column_groupby_column) return this._basic_statistic_2_sql();
-        const column_groupby_column_name = getSqlGroup(column_groupby_column, {
+        const column_groupby_column_name = this._chart_column_name_to_sql(column_groupby_column, {
           'date_granularity': column_groupby_date_granularity,
           'geolocation_granularity': column_groupby_geolocation_granularity
         });
@@ -262,7 +253,7 @@ class ChartDataSQL {
       if (!column_groupby_column) {
         return "SELECT ".concat(groupby_column_name, ", ").concat(summary_column_name, " FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY ").concat(groupby_column_name, " LIMIT 0, 5000");
       }
-      const column_groupby_column_name = getSqlGroup(column_groupby_column, {
+      const column_groupby_column_name = this._chart_column_name_to_sql(column_groupby_column, {
         'date_granularity': column_groupby_date_granularity,
         'geolocation_granularity': column_groupby_geolocation_granularity
       });
@@ -273,13 +264,11 @@ class ChartDataSQL {
         x_axis_column_key,
         x_axis_date_granularity,
         x_axis_geolocation_granularity,
-        y_axises
+        y_axises,
+        x_axis_include_empty_cells
       } = this.chart;
-      if (!x_axis_column_key) {
-        return '';
-      }
-      const groupbyColumn = this._get_column_by_key(x_axis_column_key);
-      if (!groupbyColumn) {
+      const groupby_column = this._get_column_by_key(x_axis_column_key);
+      if (!groupby_column) {
         this.error = 'Group_by_column_not_found';
         return '';
       }
@@ -287,66 +276,32 @@ class ChartDataSQL {
         this.error = 'Y_axis_column_not_found';
         return '';
       }
-      const sqlCondition = filter2SqlCondition(this.table, this.chart);
-      const isTimeColumn = TIME_COLUMN_LIST.includes(groupbyColumn.type);
-      let groupbyName = "`".concat(groupbyColumn.name, "`");
-      if (isTimeColumn) {
-        groupbyName = getSqlGroup(groupbyColumn, {
-          date_granularity: x_axis_date_granularity
-        });
-      } else if (groupbyColumn.type === CellType.GEOLOCATION) {
-        groupbyName = getSqlGroup(groupbyColumn, {
-          geolocation_granularity: x_axis_geolocation_granularity
-        });
-      }
-      const summaryType = CHART_SUMMARY_TYPE.ADVANCED;
-      const summaryColumn = null;
-      const summaryMethod = null;
-      const sqlArr = [];
+      this._update_filter_sql(x_axis_include_empty_cells, groupby_column);
+      const groupby_column_name = this._chart_column_name_to_sql(groupby_column, {
+        date_granularity: x_axis_date_granularity,
+        geolocation_granularity: x_axis_geolocation_granularity
+      });
+      const SQLs = [];
       for (let i = 0, len = y_axises.length; i < len; i++) {
         const stack = y_axises[i];
         const {
-          type: yAxisType,
+          type: y_axis_type,
           column_groupby_numeric_columns
         } = stack;
-        if (yAxisType === CHART_TYPE.BAR_STACK && column_groupby_numeric_columns && Array.isArray(column_groupby_numeric_columns) && column_groupby_numeric_columns.length !== 0) {
-          const yAxisType = "".concat(Y_AXIS_TYPE_PREFIX).concat(i);
+        let sql = '';
+        if (y_axis_type === CHART_TYPE.BAR_STACK && column_groupby_numeric_columns && Array.isArray(column_groupby_numeric_columns) && column_groupby_numeric_columns.length !== 0) {
           // just support summary numeric columns.
-          const isAdvanced = summaryType === CHART_SUMMARY_TYPE.ADVANCED;
-          let numericColumns = [];
-          let groupColumnNames = [];
-          let groupMethods = [];
-          let originalMethods = [];
-          if (summaryColumn) {
-            const summaryColumnName = isAdvanced ? summaryColumn.name : "`".concat(groupbyColumn.name, "`");
-            const method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[summaryMethod] : 'COUNT';
-            const summaryColumnMethod = this._summary_column_2_sql(method, summaryColumn);
-            numericColumns.push(summaryColumn);
-            groupColumnNames.push(summaryColumnName);
-            groupMethods.push(summaryColumnMethod);
-            originalMethods.push(summaryMethod);
-          }
+          let group_methods = [];
           column_groupby_numeric_columns.forEach(item => {
-            const numericColumn = this._get_column_by_key(item.column_key);
-            const groupColumnName = numericColumn.name;
-            numericColumns.push(numericColumn);
-            groupColumnNames.push(groupColumnName);
-            groupMethods.push(this._summary_column_2_sql(DTABLE_DB_SUMMARY_METHOD[item.summary_method.toUpperCase()], numericColumn));
-            originalMethods.push(item.summary_method);
-          });
-          const sqlString = "select ".concat(groupbyName, ", ").concat(groupMethods.join(','), " from `").concat(this.table.name, "` ").concat(sqlCondition, " group by ").concat(groupbyName, " order by ").concat(groupbyName, " limit 5000");
-          sqlArr.push({
-            sqlString,
-            groupMethods,
-            originalMethods,
-            numericColumns,
-            groupColumnNames,
-            yAxisType
+            const numeric_column = this._get_column_by_key(item.column_key);
+            group_methods.push(this._summary_column_2_sql(DTABLE_DB_SUMMARY_METHOD[item.summary_method.toUpperCase()], numeric_column));
           });
+          sql = "SELECT ".concat(groupby_column_name, ", ").concat(group_methods.join(','), " FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY ").concat(groupby_column_name, " LIMIT 5000");
         }
+        SQLs.push(sql);
       }
-      if (sqlArr.length !== 0) {
-        return sqlArr;
+      if (SQLs.length !== 0) {
+        return SQLs;
       }
       this.error = 'Y_axis_column_not_found';
       return '';
@@ -357,32 +312,29 @@ class ChartDataSQL {
         y_axis_summary_type,
         y_axis_column_key,
         x_axis_geolocation_granularity,
-        y_axis_summary_method
+        y_axis_summary_method,
+        x_axis_include_empty_cells
       } = this.chart;
       const groupby_column = this._get_column_by_key(x_axis_column_key);
       if (!groupby_column) {
         this.error = 'Group_by_column_not_found';
         return '';
       }
-      const isAdvanced = y_axis_summary_type === CHART_SUMMARY_TYPE.ADVANCED;
-      const method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[y_axis_summary_method] : DTABLE_DB_SUMMARY_METHOD.COUNT;
-      let groupName = getSqlGroup(groupby_column, {
+      this._update_filter_sql(x_axis_include_empty_cells, groupby_column);
+      const groupby_column_name = this._chart_column_name_to_sql(groupby_column, {
         'date_granularity': 'day',
         'geolocation_granularity': x_axis_geolocation_granularity
       });
-      const sqlOrder = this._get_sql_order_by(null, groupName);
-      let selectedSummaryColumn = {};
-      selectedSummaryColumn = this._get_column_by_key(y_axis_column_key);
-      if (isAdvanced) {
-        if (!selectedSummaryColumn) {
+      let summary_column_name = this._summary_column_2_sql('COUNT', groupby_column);
+      if (y_axis_summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
+        const summary_column = this._get_column_by_key(y_axis_column_key);
+        if (!summary_column) {
           this.error = 'Summary_column_not_found';
           return '';
         }
+        summary_column_name = this._summary_column_2_sql(y_axis_summary_method.toUpperCase(), summary_column);
       }
-      const summary_column = this._get_column_by_key(x_axis_column_key);
-      const summaryColumnMethod = this._summary_column_2_sql(method, summary_column);
-      const sqlCondition = filter2SqlCondition(this.table, this.chart);
-      return "SELECT ".concat(groupName, ", ").concat(summaryColumnMethod, " FROM ").concat(this.table_name, " ").concat(sqlCondition, " GROUP BY ").concat(groupName, " ").concat(sqlOrder, " LIMIT 0, 5000");
+      return "SELECT ".concat(groupby_column_name, ", ").concat(summary_column_name, " FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY ").concat(groupby_column_name, " LIMIT 0, 5000");
     };
     this._combination_chart_statistic_2_sql = () => {
       const x_axis_column_key = this.chart['x_axis_column_key'] || '';
@@ -403,7 +355,7 @@ class ChartDataSQL {
         return '';
       }
       this._update_filter_sql(x_axis_include_empty_cells, groupby_column);
-      const groupby_column_name = getSqlGroup(groupby_column, {
+      const groupby_column_name = this._chart_column_name_to_sql(groupby_column, {
         'date_granularity': x_axis_date_granularity,
         'geolocation_granularity': x_axis_geolocation_granularity
       });
@@ -503,7 +455,7 @@ class ChartDataSQL {
         return '';
       }
       this._update_filter_sql(groupby_include_empty_cells, groupby_column);
-      const groupby_column_name = getSqlGroup(groupby_column, {
+      const groupby_column_name = this._chart_column_name_to_sql(groupby_column, {
         'date_granularity': groupby_date_granularity,
         'geolocation_granularity': groupby_geolocation_granularity
       });
@@ -584,11 +536,11 @@ class ChartDataSQL {
         return '';
       }
       this._update_filter_sql(groupby_include_empty_cells, groupby_column);
-      const groupby_column_name = getSqlGroup(groupby_column, {
+      const groupby_column_name = this._chart_column_name_to_sql(groupby_column, {
         'date_granularity': groupby_date_granularity,
         'geolocation_granularity': groupby_geolocation_granularity
       });
-      const column_groupby_column_name = getSqlGroup(column_groupby_column, {
+      const column_groupby_column_name = this._chart_column_name_to_sql(column_groupby_column, {
         'date_granularity': column_groupby_date_granularity,
         'geolocation_granularity': column_groupby_geolocation_granularity
       });
@@ -625,7 +577,7 @@ class ChartDataSQL {
         return '';
       }
       this._update_filter_sql(groupby_include_empty_cells, groupby_column);
-      const groupby_column_name = getSqlGroup(groupby_column, {
+      const groupby_column_name = this._chart_column_name_to_sql(groupby_column, {
         'date_granularity': groupby_date_granularity,
         'geolocation_granularity': groupby_geolocation_granularity
       });
@@ -701,46 +653,45 @@ class ChartDataSQL {
       return "SELECT ".concat(target_summary_column_name, ", ").concat(total_summary_column_name, " FROM ").concat(this.table_name, " ").concat(this.filter_sql, " LIMIT 0, 5000");
     };
     this._completeness_chart_statistic_2_sql = () => {
-      var _this$_get_column_by_, _this$_get_column_by_2;
       const groupby_column_key = this.chart['groupby_column_key'];
-      const targetColumnKey = this.chart['target_column_key'];
-      const completedColumnKey = this.chart['completed_column_key'];
+      const target_column_key = this.chart['target_column_key'];
+      const completed_column_key = this.chart['completed_column_key'];
       const column_groupby_column_key = this.chart['column_groupby_column_key'];
       const date_granularity = this.chart['date_granularity'];
       const geolocation_granularity = this.chart['geolocation_granularity'];
-
-      // get column name
       const groupby_column = this._get_column_by_key(groupby_column_key);
-      const x_axis_include_empty_cells = this.chart['x_axis_include_empty_cells'] || false;
-      this._update_filter_sql(x_axis_include_empty_cells, groupby_column);
-      const groupbyColumnName = groupby_column === null || groupby_column === void 0 ? void 0 : groupby_column.name;
-      if (!groupbyColumnName) {
+      if (!groupby_column) {
         this.error = 'Group_by_column_not_found';
         return '';
       }
-      const targetColumnName = (_this$_get_column_by_ = this._get_column_by_key(targetColumnKey)) === null || _this$_get_column_by_ === void 0 ? void 0 : _this$_get_column_by_.name;
-      const completedColumnName = (_this$_get_column_by_2 = this._get_column_by_key(completedColumnKey)) === null || _this$_get_column_by_2 === void 0 ? void 0 : _this$_get_column_by_2.name;
-      if (!completedColumnName) {
-        this.error = 'Completed_column_not_found';
+      const target_column = this._get_column_by_key(target_column_key);
+      if (!target_column) {
+        this.error = 'Target_column_not_found';
         return '';
       }
-      if (!targetColumnName) {
-        this.error = 'Target_column_not_found';
+      const completed_column = this._get_column_by_key(completed_column_key);
+      if (!completed_column) {
+        this.error = 'Completed_column_not_found';
         return '';
       }
+      const x_axis_include_empty_cells = this.chart['x_axis_include_empty_cells'] || false;
+      this._update_filter_sql(x_axis_include_empty_cells, groupby_column);
+      const groupby_column_name = groupby_column.name;
+      const target_column_name = target_column.name;
+      const completed_column_name = completed_column.name;
       if (column_groupby_column_key) {
         const column_groupby_column = this._get_column_by_key(column_groupby_column_key);
         if (!column_groupby_column) {
           this.error = 'Column_group_by_column_not_found';
           return '';
         }
-        const column_groupby_column_name = getSqlGroup(column_groupby_column, {
+        const column_groupby_column_name = this._chart_column_name_to_sql(column_groupby_column, {
           'date_granularity': date_granularity,
           'geolocation_granularity': geolocation_granularity
         });
-        return "SELECT `".concat(groupbyColumnName, "`, ").concat(column_groupby_column_name, ", SUM(`").concat(targetColumnName, "`), SUM(`").concat(completedColumnName, "`) FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY `").concat(groupbyColumnName, "`, ").concat(column_groupby_column_name, " LIMIT 0, 5000");
+        return "SELECT `".concat(groupby_column_name, "`, ").concat(column_groupby_column_name, ", SUM(`").concat(target_column_name, "`), SUM(`").concat(completed_column_name, "`) FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY `").concat(groupby_column_name, "`, ").concat(column_groupby_column_name, " LIMIT 0, 5000");
       }
-      return "SELECT `".concat(groupbyColumnName, "`, `").concat(targetColumnName, "`, `").concat(completedColumnName, "` FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY `").concat(groupbyColumnName, "`, `").concat(targetColumnName, "`, `").concat(completedColumnName, "` LIMIT 0, 5000");
+      return "SELECT `".concat(groupby_column_name, "`, `").concat(target_column_name, "`, `").concat(completed_column_name, "` FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY `").concat(groupby_column_name, "`, `").concat(target_column_name, "`, `").concat(completed_column_name, "` LIMIT 0, 5000");
     };
     this._scatter_statistic_2_sql = () => {
       const x_axis_column_key = this.chart['x_axis_column_key'];
@@ -752,15 +703,20 @@ class ChartDataSQL {
 
       // x axis column
       const x_axis_column = this._get_column_by_key(x_axis_column_key);
-      this._update_filter_sql(x_axis_include_empty_cells, x_axis_column);
-      const xAxisColumnName = x_axis_column === null || x_axis_column === void 0 ? void 0 : x_axis_column.name;
-      if (!xAxisColumnName) {
-        this.error = 'Group_by_column_not_found';
+      if (!x_axis_column) {
+        this.error = 'X_axis_column_not_found';
         return '';
       }
+
       // y axis column
       const y_axis_column = this._get_column_by_key(y_axis_column_key);
-      const yAxisColumnName = y_axis_column === null || y_axis_column === void 0 ? void 0 : y_axis_column.name;
+      if (!y_axis_column) {
+        this.error = 'Y_axis_column_not_found';
+        return '';
+      }
+      this._update_filter_sql(x_axis_include_empty_cells, x_axis_column);
+      const xAxisColumnName = x_axis_column.name;
+      const yAxisColumnName = y_axis_column.name;
       if (!yAxisColumnName) {
         this.error = 'Y_axis_column_not_found';
         return '';
@@ -771,11 +727,11 @@ class ChartDataSQL {
           this.error = 'Column_group_by_column_not_found';
           return '';
         }
-        const column_groupby_column_name = getSqlGroup(column_groupby_column, {
+        const column_groupby_column_name = this._chart_column_name_to_sql(column_groupby_column, {
           'date_granularity': date_granularity,
           'geolocation_granularity': geolocation_granularity
         });
-        return "SELECT `".concat(xAxisColumnName, "`, `").concat(yAxisColumnName, "`, ").concat(column_groupby_column_name, " FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY `").concat(xAxisColumnName, "`, `").concat(yAxisColumnName, "` ,").concat(column_groupby_column_name, " LIMIT 0, 5000");
+        return "SELECT `".concat(xAxisColumnName, "`, `").concat(yAxisColumnName, "`, ").concat(column_groupby_column_name, " FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY `").concat(xAxisColumnName, "`, `").concat(yAxisColumnName, "`, ").concat(column_groupby_column_name, " LIMIT 0, 5000");
       }
       return "SELECT `".concat(xAxisColumnName, "`, `").concat(yAxisColumnName, "` FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY `").concat(xAxisColumnName, "`, `").concat(yAxisColumnName, "` LIMIT 0, 5000");
     };
@@ -788,7 +744,7 @@ class ChartDataSQL {
         summary_method,
         summary_column_key
       } = this.chart;
-      const groupby_column = this.columnKeyMap[geo_column_key];
+      const groupby_column = this._get_column_by_key(geo_column_key);
       if (!groupby_column) {
         this.error = 'Geo_column_not_found';
         return '';
@@ -797,7 +753,7 @@ class ChartDataSQL {
       this._update_filter_sql(false, groupby_column);
 
       // map do not have date column ,so date_granularity is not needed
-      const groupby_column_name = getSqlGroup(groupby_column, {
+      const groupby_column_name = this._chart_column_name_to_sql(groupby_column, {
         'date_granularity': null,
         'geolocation_granularity': geolocation_granularity
       });
@@ -806,7 +762,7 @@ class ChartDataSQL {
       if (uppercase_summary_type === 'COUNT') {
         summary_column_name = this._summary_column_2_sql('COUNT', groupby_column);
       } else {
-        const summary_column = this.columnKeyMap[summary_column_key];
+        const summary_column = this._get_column_by_key(summary_column_key);
         if (summary_column) {
           const uppercase_summary_method = summary_method.toUpperCase();
           summary_column_name = this._summary_column_2_sql(uppercase_summary_method, summary_column);
@@ -829,23 +785,21 @@ class ChartDataSQL {
         this.error = 'Geo_column_not_found';
         return '';
       }
-      const columnName = groupby_column.name;
-      const isAdvanced = summary_type === CHART_SUMMARY_TYPE.ADVANCED;
-      const method = isAdvanced ? DTABLE_DB_SUMMARY_METHOD[summary_method] : 'COUNT';
       this._update_filter_sql(false, groupby_column);
-      let sqlString = '';
-      if (isAdvanced) {
+      const column_name = this._chart_column_name_to_sql(groupby_column, {
+        'date_granularity': '',
+        'geolocation_granularity': ''
+      });
+      let summary_column_name = this._summary_column_2_sql('COUNT', groupby_column);
+      if (summary_type === CHART_SUMMARY_TYPE.ADVANCED) {
         const summary_column = this._get_column_by_key(summary_column_key);
         if (!summary_column) {
           this.error = 'Summary_column_not_found';
           return '';
         }
-        const summary_column_name = this._summary_column_2_sql(summary_method.toUpperCase(), summary_column);
-        sqlString = "select `".concat(columnName, "`, ").concat(summary_column_name, " from ").concat(this.table_name, " ").concat(this.filter_sql, " group by ").concat(columnName, " limit 5000");
-      } else {
-        sqlString = "select `".concat(columnName, "`, ").concat(method, "(").concat(columnName, ") from ").concat(this.table_name, " ").concat(this.filter_sql, " group by ").concat(columnName, " limit 5000");
+        summary_column_name = this._summary_column_2_sql(summary_method.toUpperCase(), summary_column);
       }
-      return sqlString;
+      return "SELECT ".concat(column_name, ", ").concat(summary_column_name, " FROM ").concat(this.table_name, " ").concat(this.filter_sql, " GROUP BY ").concat(column_name, " LIMIT 0, 5000");
     };
     this.to_sql = () => {
       if (this.error) {
@@ -997,15 +951,14 @@ class ChartDataSQL {
     this.table = table;
     this.chart = (chart === null || chart === void 0 ? void 0 : chart.config) || {};
     this.username = username;
-    this.userId = userId;
-    const tableName = (table === null || table === void 0 ? void 0 : table.name) || '';
-    this.table_name = "`".concat(tableName, "`");
+    const table_name = (table === null || table === void 0 ? void 0 : table.name) || '';
+    this.table_name = "`".concat(table_name, "`");
     this.chart_type = (chart === null || chart === void 0 ? void 0 : (_chart$config = chart.config) === null || _chart$config === void 0 ? void 0 : _chart$config.type) || '';
 
     // columns
-    this.columnKeyMap = {};
+    this.column_key_map = {};
     Array.isArray(table.columns) && table.columns.forEach(column => {
-      this.columnKeyMap[column.key] = column;
+      this.column_key_map[column.key] = column;
     });
     this.filter_sql = filter2SqlCondition(table, chart, username, userId, userDepartmentIdsMap);
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "sea-chart",
-  "version": "0.0.30",
+  "version": "0.0.31beta",
   "main": "./dist/index.js",
   "dependencies": {
     "@antv/data-set": "0.11.8",
@@ -22,7 +22,7 @@
   "peerDependencies": {
     "@antv/scale": "0.3.14",
     "babel-plugin-on-demand-loading": "^0.0.9",
-    "dtable-ui-component": "4.4.31",
+    "dtable-ui-component": "~4.4.31",
     "dtable-utils": "~4.4.*",
     "prop-types": "15.8.1",
     "react": "^17.0.0",