@finos/legend-data-cube 0.1.2 → 0.1.4

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (12) hide show
  1. package/lib/index.css +1 -1
  2. package/lib/package.json +1 -1
  3. package/lib/stores/view/grid/DataCubeGridClientEngine.d.ts +1 -1
  4. package/lib/stores/view/grid/DataCubeGridClientEngine.d.ts.map +1 -1
  5. package/lib/stores/view/grid/DataCubeGridClientEngine.js +16 -19
  6. package/lib/stores/view/grid/DataCubeGridClientEngine.js.map +1 -1
  7. package/lib/stores/view/grid/DataCubeGridQueryBuilder.d.ts.map +1 -1
  8. package/lib/stores/view/grid/DataCubeGridQueryBuilder.js +7 -6
  9. package/lib/stores/view/grid/DataCubeGridQueryBuilder.js.map +1 -1
  10. package/package.json +1 -1
  11. package/src/stores/view/grid/DataCubeGridClientEngine.ts +20 -23
  12. package/src/stores/view/grid/DataCubeGridQueryBuilder.ts +11 -5
package/lib/index.css CHANGED
@@ -1,4 +1,4 @@
1
- /** @license @finos/legend-data-cube v0.1.2
1
+ /** @license @finos/legend-data-cube v0.1.4
2
2
  * Copyright (c) 2020-present, Goldman Sachs
3
3
  *
4
4
  * Licensed under the Apache License, Version 2.0 (the "License");
package/lib/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@finos/legend-data-cube",
3
- "version": "0.1.2",
3
+ "version": "0.1.4",
4
4
  "description": "Legend DataCube",
5
5
  "keywords": [
6
6
  "legend",
package/lib/stores/view/grid/DataCubeGridClientEngine.d.ts CHANGED
@@ -66,7 +66,7 @@ export declare const INTERNAL__GRID_CLIENT_MISSING_VALUE = "__MISSING";
66
66
  export declare const INTERNAL__GRID_CLIENT_TREE_COLUMN_ID = "ag-Grid-AutoColumn";
67
67
  export declare const INTERNAL__GRID_CLIENT_ROOT_AGGREGATION_COLUMN_ID = "INTERNAL__rootAggregation";
68
68
  export declare const INTERNAL__GRID_CLIENT_DATA_FETCH_MANUAL_TRIGGER_COLUMN_ID = "INTERNAL__dataFetchManualTrigger";
69
- export declare const INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID = "INTERNAL__count";
69
+ export declare const INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID = "count";
70
70
  export declare enum DataCubeGridClientPinnedAlignement {
71
71
  LEFT = "left",
72
72
  RIGHT = "right"
package/lib/stores/view/grid/DataCubeGridClientEngine.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeGridClientEngine.d.ts","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridClientEngine.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DataCubeGridClientEngine.d.ts","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridClientEngine.ts"],"names":[],"mappings":"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"}
package/lib/stores/view/grid/DataCubeGridClientEngine.js CHANGED
@@ -15,19 +15,18 @@
15
15
  */
16
16
  import { IllegalStateError, assertErrorThrown, guaranteeNonNullable, hashObject, isBoolean, isNonNullable, pruneObject, } from '@finos/legend-shared';
17
17
  import { buildExecutableQuery } from '../../core/DataCubeQueryBuilder.js';
18
- import { PureClientVersion } from '@finos/legend-graph';
18
+ import { PRIMITIVE_TYPE, PureClientVersion, } from '@finos/legend-graph';
19
19
  import { makeObservable, observable, runInAction } from 'mobx';
20
20
  import {} from '../../core/DataCubeQuerySnapshot.js';
21
21
  import { _findCol, _sortByColName } from '../../core/model/DataCubeColumn.js';
22
22
  import { isPivotResultColumnName } from '../../core/DataCubeQueryEngine.js';
23
23
  import { buildQuerySnapshot } from './DataCubeGridQuerySnapshotBuilder.js';
24
24
  import { AlertType } from '../../services/DataCubeAlertService.js';
25
- import { sum } from 'mathjs';
26
- import { _aggCountCol, buildGridDataFetchExecutableQuery, } from './DataCubeGridQueryBuilder.js';
27
- import { _colSpecArrayParam } from '../../core/DataCubeQuerySnapshotBuilderUtils.js';
25
+ import { buildGridDataFetchExecutableQuery } from './DataCubeGridQueryBuilder.js';
28
26
  import { DataCubeSettingKey } from '../../../__lib__/DataCubeSetting.js';
29
27
  import { DEFAULT_ALERT_WINDOW_CONFIG } from '../../services/DataCubeLayoutService.js';
30
28
  import { _lambda } from '../../core/DataCubeQueryBuilderUtils.js';
29
+ import { sum } from 'mathjs';
31
30
  export var DataCubeGridClientExportFormat;
32
31
  (function (DataCubeGridClientExportFormat) {
33
32
  DataCubeGridClientExportFormat["CSV"] = "CSV";
@@ -83,7 +82,7 @@ export const INTERNAL__GRID_CLIENT_MISSING_VALUE = '__MISSING';
83
82
  export const INTERNAL__GRID_CLIENT_TREE_COLUMN_ID = 'ag-Grid-AutoColumn';
84
83
  export const INTERNAL__GRID_CLIENT_ROOT_AGGREGATION_COLUMN_ID = 'INTERNAL__rootAggregation';
85
84
  export const INTERNAL__GRID_CLIENT_DATA_FETCH_MANUAL_TRIGGER_COLUMN_ID = 'INTERNAL__dataFetchManualTrigger';
86
- export const INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID = 'INTERNAL__count';
85
+ export const INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID = 'count';
87
86
  export var DataCubeGridClientPinnedAlignement;
88
87
  (function (DataCubeGridClientPinnedAlignement) {
89
88
  DataCubeGridClientPinnedAlignement["LEFT"] = "left";
@@ -180,25 +179,22 @@ async function getCastColumns(currentSnapshot, view) {
180
179
  snapshot.data.groupExtendedColumns = [];
181
180
  snapshot.data.sortColumns = [];
182
181
  snapshot.data.limit = 0;
183
- const query = buildExecutableQuery(snapshot, view.source, view.engine, {
184
- postProcessor: (_snapshot, sequence, funcMap, configuration, engine) => {
185
- // when both pivot and groupBy present, we need to account for the count column
186
- // in the cast expression
187
- if (funcMap.pivot && currentSnapshot.data.groupBy) {
188
- _colSpecArrayParam(funcMap.pivot, 1).colSpecs.push(_aggCountCol());
189
- }
190
- },
191
- });
182
+ const query = buildExecutableQuery(snapshot, view.source, view.engine);
192
183
  const result = await view.engine.executeQuery(_lambda([], [query]), view.source, {
193
184
  debug: view.settingService.getBooleanValue(DataCubeSettingKey.DEBUGGER__ENABLE_DEBUG_MODE),
194
185
  clientVersion: view.settingService.getBooleanValue(DataCubeSettingKey.DEBUGGER__USE_DEV_CLIENT_PROTOCOL_VERSION)
195
186
  ? PureClientVersion.VX_X_X
196
187
  : undefined,
197
188
  });
198
- return result.result.builder.columns.map((column) => ({
199
- name: column.name,
200
- type: column.type,
201
- }));
189
+ return result.result.builder.columns.map((column) => {
190
+ const type = column.type;
191
+ return {
192
+ name: column.name,
193
+ // FIXME: this is a workaround to help plan generation does not handle well decimal type
194
+ // Remove this once https://github.com/finos/legend-engine/pull/3400 is productionized
195
+ type: type === PRIMITIVE_TYPE.DECIMAL ? PRIMITIVE_TYPE.FLOAT : type,
196
+ };
197
+ });
202
198
  }
203
199
  export class DataCubeGridClientServerSideDataSource {
204
200
  _view;
@@ -269,6 +265,7 @@ export class DataCubeGridClientServerSideDataSource {
269
265
  // ------------------------------ DATA ------------------------------
270
266
  const executableQuery = buildGridDataFetchExecutableQuery(request, newSnapshot, this._view.source, this._view.engine, this._grid.isPaginationEnabled);
271
267
  let result;
268
+ let rowData;
272
269
  try {
273
270
  result = await this._view.engine.executeQuery(_lambda([], [executableQuery]), this._view.source, {
274
271
  debug: this._view.settingService.getBooleanValue(DataCubeSettingKey.DEBUGGER__ENABLE_DEBUG_MODE),
@@ -276,6 +273,7 @@ export class DataCubeGridClientServerSideDataSource {
276
273
  ? PureClientVersion.VX_X_X
277
274
  : undefined,
278
275
  });
276
+ rowData = buildRowData(result.result.result, newSnapshot);
279
277
  }
280
278
  catch (error) {
281
279
  assertErrorThrown(error);
@@ -286,7 +284,6 @@ export class DataCubeGridClientServerSideDataSource {
286
284
  params.fail();
287
285
  return;
288
286
  }
289
- const rowData = buildRowData(result.result.result, newSnapshot);
290
287
  if (this._view.settingService.getBooleanValue(DataCubeSettingKey.DEBUGGER__ENABLE_DEBUG_MODE)) {
291
288
  this._view.engine.debugProcess(`Execution`, ['Query', result.executedQuery], [
292
289
  'Stats',
package/lib/stores/view/grid/DataCubeGridClientEngine.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeGridClientEngine.js","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridClientEngine.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DataCubeGridClientEngine.js","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridClientEngine.ts"],"names":[],"mappings":"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"}
package/lib/stores/view/grid/DataCubeGridQueryBuilder.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeGridQueryBuilder.d.ts","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridQueryBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,KAAK,UAAU,EAKhB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AA8BjF,OAAO,EAIL,KAAK,kCAAkC,EACxC,MAAM,+BAA+B,CAAC;AAIvC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE;;;;;;;+EAO+E;AAI/E,wBAAgB,YAAY,eAO3B;AA4DD,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,kCAAkC,EAC3C,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,OAAO,uDAgC1B"}
1
+ {"version":3,"file":"DataCubeGridQueryBuilder.d.ts","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridQueryBuilder.ts"],"names":[],"mappings":"AAAA;;;;;;;;;;;;;;GAcG;AAEH,OAAO,EAGL,KAAK,UAAU,EAMhB,MAAM,qBAAqB,CAAC;AAC7B,OAAO,EAAE,KAAK,qBAAqB,EAAE,MAAM,qCAAqC,CAAC;AA8BjF,OAAO,EAIL,KAAK,kCAAkC,EACxC,MAAM,+BAA+B,CAAC;AAIvC,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,oCAAoC,CAAC;AACzE,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,8BAA8B,CAAC;AAEnE;;;;;;;+EAO+E;AAI/E,wBAAgB,YAAY,eAO3B;AAiED,wBAAgB,iCAAiC,CAC/C,OAAO,EAAE,kCAAkC,EAC3C,QAAQ,EAAE,qBAAqB,EAC/B,MAAM,EAAE,cAAc,EACtB,MAAM,EAAE,cAAc,EACtB,gBAAgB,EAAE,OAAO,uDAgC1B"}
package/lib/stores/view/grid/DataCubeGridQueryBuilder.js CHANGED
@@ -13,7 +13,7 @@
13
13
  * See the License for the specific language governing permissions and
14
14
  * limitations under the License.
15
15
  */
16
- import { PRIMITIVE_TYPE, V1_GenericTypeInstance, V1_GenericType, V1_RelationType, V1_getGenericTypeFullPath, } from '@finos/legend-graph';
16
+ import { PRIMITIVE_TYPE, V1_GenericTypeInstance, V1_GenericType, V1_RelationType, V1_getGenericTypeFullPath, V1_createRelationTypeColumn, } from '@finos/legend-graph';
17
17
  import {} from '../../core/DataCubeQuerySnapshot.js';
18
18
  import { DataCubeQueryFilterGroupOperator, DataCubeQueryFilterOperator, DataCubeFunction, isPivotResultColumnName, PIVOT_COLUMN_NAME_VALUE_SEPARATOR, DataCubeQuerySortDirection, DataCubeOperationAdvancedValueType, } from '../../core/DataCubeQueryEngine.js';
19
19
  import { guaranteeNonNullable, guaranteeType, isNullable, uniq, } from '@finos/legend-shared';
@@ -44,18 +44,19 @@ function _aggCountCastCol(colName) {
44
44
  function _addCountAggColumnToPivot(funcMap, countAggColumns) {
45
45
  if (funcMap.pivot && funcMap.pivotCast) {
46
46
  _colSpecArrayParam(funcMap.pivot, 1).colSpecs.push(_aggCountCol());
47
- const castColumns = guaranteeType(guaranteeType(guaranteeType(funcMap.pivotCast.parameters[0], V1_GenericTypeInstance)
48
- .genericType.typeArguments[0], V1_GenericType).rawType, V1_RelationType).columns.map((column) => _colSpec(column.name, undefined, undefined, V1_getGenericTypeFullPath(column.genericType)));
47
+ const relationType = guaranteeType(guaranteeType(guaranteeType(funcMap.pivotCast.parameters[0], V1_GenericTypeInstance)
48
+ .genericType.typeArguments[0], V1_GenericType).rawType, V1_RelationType);
49
+ const castColumns = relationType.columns.map((column) => _colSpec(column.name, undefined, undefined, V1_getGenericTypeFullPath(column.genericType)));
49
50
  uniq(castColumns
50
51
  .filter((col) => isPivotResultColumnName(col.name))
51
52
  .map((col) => col.name.substring(0, col.name.lastIndexOf(PIVOT_COLUMN_NAME_VALUE_SEPARATOR))))
52
53
  .map((col) => col +
53
54
  PIVOT_COLUMN_NAME_VALUE_SEPARATOR +
54
55
  INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID)
55
- .map((col) => _colSpec(col, undefined, undefined, PRIMITIVE_TYPE.INTEGER))
56
56
  .forEach((col) => {
57
- castColumns.push(col);
58
- countAggColumns.push(col);
57
+ // Here we directly modify the list of cast columns in the relation type
58
+ relationType.columns.push(V1_createRelationTypeColumn(col, PRIMITIVE_TYPE.INTEGER));
59
+ countAggColumns.push(_colSpec(col, undefined, undefined, PRIMITIVE_TYPE.INTEGER));
59
60
  });
60
61
  }
61
62
  }
package/lib/stores/view/grid/DataCubeGridQueryBuilder.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"DataCubeGridQueryBuilder.js","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridQueryBuilder.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"DataCubeGridQueryBuilder.js","sourceRoot":"","sources":["../../../../src/stores/view/grid/DataCubeGridQueryBuilder.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@finos/legend-data-cube",
3
- "version": "0.1.2",
3
+ "version": "0.1.4",
4
4
  "description": "Legend DataCube",
5
5
  "keywords": [
6
6
  "legend",
package/src/stores/view/grid/DataCubeGridClientEngine.ts CHANGED
@@ -31,7 +31,11 @@ import {
31
31
  pruneObject,
32
32
  } from '@finos/legend-shared';
33
33
  import { buildExecutableQuery } from '../../core/DataCubeQueryBuilder.js';
34
- import { PureClientVersion, type TabularDataSet } from '@finos/legend-graph';
34
+ import {
35
+ PRIMITIVE_TYPE,
36
+ PureClientVersion,
37
+ type TabularDataSet,
38
+ } from '@finos/legend-graph';
35
39
  import { makeObservable, observable, runInAction } from 'mobx';
36
40
  import type {
37
41
  DataCubeConfiguration,
@@ -42,17 +46,13 @@ import { _findCol, _sortByColName } from '../../core/model/DataCubeColumn.js';
42
46
  import { isPivotResultColumnName } from '../../core/DataCubeQueryEngine.js';
43
47
  import { buildQuerySnapshot } from './DataCubeGridQuerySnapshotBuilder.js';
44
48
  import { AlertType } from '../../services/DataCubeAlertService.js';
45
- import { sum } from 'mathjs';
46
49
  import type { DataCubeViewState } from '../DataCubeViewState.js';
47
- import {
48
- _aggCountCol,
49
- buildGridDataFetchExecutableQuery,
50
- } from './DataCubeGridQueryBuilder.js';
51
- import { _colSpecArrayParam } from '../../core/DataCubeQuerySnapshotBuilderUtils.js';
50
+ import { buildGridDataFetchExecutableQuery } from './DataCubeGridQueryBuilder.js';
52
51
  import { DataCubeSettingKey } from '../../../__lib__/DataCubeSetting.js';
53
52
  import { DEFAULT_ALERT_WINDOW_CONFIG } from '../../services/DataCubeLayoutService.js';
54
53
  import type { DataCubeExecutionResult } from '../../core/DataCubeEngine.js';
55
54
  import { _lambda } from '../../core/DataCubeQueryBuilderUtils.js';
55
+ import { sum } from 'mathjs';
56
56
 
57
57
  type DataCubeGridClientCellValue = string | number | boolean | null | undefined;
58
58
  type DataCubeGridClientRowData = {
@@ -137,8 +137,7 @@ export const INTERNAL__GRID_CLIENT_ROOT_AGGREGATION_COLUMN_ID =
137
137
  'INTERNAL__rootAggregation';
138
138
  export const INTERNAL__GRID_CLIENT_DATA_FETCH_MANUAL_TRIGGER_COLUMN_ID =
139
139
  'INTERNAL__dataFetchManualTrigger';
140
- export const INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID =
141
- 'INTERNAL__count';
140
+ export const INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID = 'count';
142
141
 
143
142
  export enum DataCubeGridClientPinnedAlignement {
144
143
  LEFT = 'left',
@@ -263,15 +262,7 @@ async function getCastColumns(
263
262
  snapshot.data.groupExtendedColumns = [];
264
263
  snapshot.data.sortColumns = [];
265
264
  snapshot.data.limit = 0;
266
- const query = buildExecutableQuery(snapshot, view.source, view.engine, {
267
- postProcessor: (_snapshot, sequence, funcMap, configuration, engine) => {
268
- // when both pivot and groupBy present, we need to account for the count column
269
- // in the cast expression
270
- if (funcMap.pivot && currentSnapshot.data.groupBy) {
271
- _colSpecArrayParam(funcMap.pivot, 1).colSpecs.push(_aggCountCol());
272
- }
273
- },
274
- });
265
+ const query = buildExecutableQuery(snapshot, view.source, view.engine);
275
266
 
276
267
  const result = await view.engine.executeQuery(
277
268
  _lambda([], [query]),
@@ -288,10 +279,15 @@ async function getCastColumns(
288
279
  },
289
280
  );
290
281
 
291
- return result.result.builder.columns.map((column) => ({
292
- name: column.name,
293
- type: column.type as string,
294
- }));
282
+ return result.result.builder.columns.map((column) => {
283
+ const type = column.type as string;
284
+ return {
285
+ name: column.name,
286
+ // FIXME: this is a workaround to help plan generation does not handle well decimal type
287
+ // Remove this once https://github.com/finos/legend-engine/pull/3400 is productionized
288
+ type: type === PRIMITIVE_TYPE.DECIMAL ? PRIMITIVE_TYPE.FLOAT : type,
289
+ };
290
+ });
295
291
  }
296
292
 
297
293
  export type DataCubeGridClientDataFetchRequest = {
@@ -402,6 +398,7 @@ export class DataCubeGridClientServerSideDataSource
402
398
  this._grid.isPaginationEnabled,
403
399
  );
404
400
  let result: DataCubeExecutionResult;
401
+ let rowData: DataCubeGridClientRowData[];
405
402
 
406
403
  try {
407
404
  result = await this._view.engine.executeQuery(
@@ -418,6 +415,7 @@ export class DataCubeGridClientServerSideDataSource
418
415
  : undefined,
419
416
  },
420
417
  );
418
+ rowData = buildRowData(result.result.result, newSnapshot);
421
419
  } catch (error) {
422
420
  assertErrorThrown(error);
423
421
  this._view.alertService.alertError(error, {
@@ -428,7 +426,6 @@ export class DataCubeGridClientServerSideDataSource
428
426
  return;
429
427
  }
430
428
 
431
- const rowData = buildRowData(result.result.result, newSnapshot);
432
429
  if (
433
430
  this._view.settingService.getBooleanValue(
434
431
  DataCubeSettingKey.DEBUGGER__ENABLE_DEBUG_MODE,
package/src/stores/view/grid/DataCubeGridQueryBuilder.ts CHANGED
@@ -22,6 +22,7 @@ import {
22
22
  V1_GenericType,
23
23
  V1_RelationType,
24
24
  V1_getGenericTypeFullPath,
25
+ V1_createRelationTypeColumn,
25
26
  } from '@finos/legend-graph';
26
27
  import { type DataCubeQuerySnapshot } from '../../core/DataCubeQuerySnapshot.js';
27
28
  import {
@@ -102,14 +103,15 @@ function _addCountAggColumnToPivot(
102
103
  ): void {
103
104
  if (funcMap.pivot && funcMap.pivotCast) {
104
105
  _colSpecArrayParam(funcMap.pivot, 1).colSpecs.push(_aggCountCol());
105
- const castColumns = guaranteeType(
106
+ const relationType = guaranteeType(
106
107
  guaranteeType(
107
108
  guaranteeType(funcMap.pivotCast.parameters[0], V1_GenericTypeInstance)
108
109
  .genericType.typeArguments[0],
109
110
  V1_GenericType,
110
111
  ).rawType,
111
112
  V1_RelationType,
112
- ).columns.map((column) =>
113
+ );
114
+ const castColumns = relationType.columns.map((column) =>
113
115
  _colSpec(
114
116
  column.name,
115
117
  undefined,
@@ -133,10 +135,14 @@ function _addCountAggColumnToPivot(
133
135
  PIVOT_COLUMN_NAME_VALUE_SEPARATOR +
134
136
  INTERNAL__GRID_CLIENT_ROW_GROUPING_COUNT_AGG_COLUMN_ID,
135
137
  )
136
- .map((col) => _colSpec(col, undefined, undefined, PRIMITIVE_TYPE.INTEGER))
137
138
  .forEach((col) => {
138
- castColumns.push(col);
139
- countAggColumns.push(col);
139
+ // Here we directly modify the list of cast columns in the relation type
140
+ relationType.columns.push(
141
+ V1_createRelationTypeColumn(col, PRIMITIVE_TYPE.INTEGER),
142
+ );
143
+ countAggColumns.push(
144
+ _colSpec(col, undefined, undefined, PRIMITIVE_TYPE.INTEGER),
145
+ );
140
146
  });
141
147
  }
142
148
  }