Skip to content

feat: Support string, time and boolean measures #5842

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Dec 16, 2022
Merged

feat: Support string, time and boolean measures #5842

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
2521813
feat: Support `string`, `time` and `boolean` measures
paveltiunov Dec 16, 2022
49f9da1
chore: Support `string`, `time` and `boolean` measures -- fix tests
paveltiunov Dec 16, 2022
64d0f61
chore: Support `string`, `time` and `boolean` measures -- fix tests
paveltiunov Dec 16, 2022
43ac4c2
chore: Support `string`, `time` and `boolean` measures -- fix tests
paveltiunov Dec 16, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
72 changes: 37 additions & 35 deletions packages/cubejs-backend-native/Cargo.lock
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion packages/cubejs-schema-compiler/src/adapter/BaseQuery.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1991,12 +1991,16 @@ class BaseQuery {
return this.primaryKeyCount(cubeName, true);
}
}
if (symbol.type === 'number') {
if (BaseQuery.isCalculatedMeasureType(symbol.type)) {
return evaluateSql;
}
return `${symbol.type}(${evaluateSql})`;
}

static isCalculatedMeasureType(type) {
return type === 'number' || type === 'string' || type === 'time' || type === 'boolean';
}

aggregateOnGroupedColumn(symbol, evaluateSql, topLevelMerge, measurePath) {
const cumulativeMeasureFilters = (this.safeEvaluateSymbolContext().cumulativeMeasureFilters || {})[measurePath];
if (cumulativeMeasureFilters) {
Expand Down
7 changes: 5 additions & 2 deletions packages/cubejs-schema-compiler/src/compiler/CubeToMetaTransformer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import R from 'ramda';
import camelCase from 'camelcase';

import { UserError } from './UserError';
import { BaseMeasure } from '../adapter';
import { BaseMeasure, BaseQuery } from '../adapter';

export class CubeToMetaTransformer {
constructor(cubeValidator, cubeEvaluator, contextEvaluator, joinGraph) {
Expand Down Expand Up @@ -106,6 +106,9 @@ export class CubeToMetaTransformer {
cubeName, drillMembers, { originalSorting: true }
)) || [];

// TODO support type qualifiers on min and max
const type = BaseQuery.isCalculatedMeasureType(nameToMetric[1].type) ? nameToMetric[1].type : 'number';

return {
name,
title: this.title(cubeTitle, nameToMetric),
Expand All @@ -114,7 +117,7 @@ export class CubeToMetaTransformer {
format: nameToMetric[1].format,
cumulativeTotal: nameToMetric[1].cumulative || BaseMeasure.isCumulative(nameToMetric[1]),
cumulative: nameToMetric[1].cumulative || BaseMeasure.isCumulative(nameToMetric[1]),
type: 'number', // TODO
type,
aggType: nameToMetric[1].type,
drillMembers: drillMembersArray,
drillMembersGrouped: {
Expand Down
Loading