Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Metabase
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Engineering Digital Service
Metabase
Commits
d3c78b60
Unverified
Commit
d3c78b60
authored
1 year ago
by
metamben
Committed by
GitHub
1 year ago
Browse files
Options
Downloads
Patches
Plain Diff
Distinguish different arities of aggregation-clause (#38726)
Fixes #37782.
parent
a0273af7
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
frontend/src/metabase/reference/utils.unit.spec.js
+4
-12
4 additions, 12 deletions
frontend/src/metabase/reference/utils.unit.spec.js
src/metabase/lib/js.cljs
+4
-4
4 additions, 4 deletions
src/metabase/lib/js.cljs
with
8 additions
and
16 deletions
frontend/src/metabase/reference/utils.unit.spec.js
+
4
−
12
View file @
d3c78b60
...
...
@@ -156,9 +156,7 @@ describe("Reference utils.js", () => {
expect
(
question
).
toEqual
(
getNewQuestion
());
});
// Unskip when this is fixed: https://github.com/metabase/metabase/issues/37782
// eslint-disable-next-line jest/no-disabled-tests
it
.
skip
(
"
should generate correct question for table counts
"
,
()
=>
{
it
(
"
should generate correct question for table counts
"
,
()
=>
{
const
question
=
getQuestion
({
dbId
,
tableId
,
...
...
@@ -188,9 +186,7 @@ describe("Reference utils.js", () => {
);
});
// Unskip when this is fixed: https://github.com/metabase/metabase/issues/37782
// eslint-disable-next-line jest/no-disabled-tests
it
.
skip
(
"
should generate correct question for field group by bar chart
"
,
()
=>
{
it
(
"
should generate correct question for field group by bar chart
"
,
()
=>
{
const
question
=
getQuestion
({
dbId
,
tableId
,
...
...
@@ -209,9 +205,7 @@ describe("Reference utils.js", () => {
);
});
// Unskip when this is fixed: https://github.com/metabase/metabase/issues/37782
// eslint-disable-next-line jest/no-disabled-tests
it
.
skip
(
"
should generate correct question for field group by pie chart
"
,
()
=>
{
it
(
"
should generate correct question for field group by pie chart
"
,
()
=>
{
const
question
=
getQuestion
({
dbId
,
tableId
,
...
...
@@ -277,9 +271,7 @@ describe("Reference utils.js", () => {
);
});
// Unskip when this is fixed: https://github.com/metabase/metabase/issues/37782
// eslint-disable-next-line jest/no-disabled-tests
it
.
skip
(
"
should generate correct question for segment counts
"
,
()
=>
{
it
(
"
should generate correct question for segment counts
"
,
()
=>
{
const
question
=
getQuestion
({
dbId
,
tableId
,
...
...
This diff is collapsed.
Click to expand it.
src/metabase/lib/js.cljs
+
4
−
4
View file @
d3c78b60
...
...
@@ -467,10 +467,10 @@
a `column`.
For aggregations requiring an argument `column` is mandatory, otherwise
it is optional."
(
[
aggregation-operator
]
(
lib.core/aggregation-clause
aggregation-operator
)
)
(
[
aggregation-operator
column
]
(
lib.core/aggregation-clause
aggregation-operator
column
)))
[
aggregation-operator
column
]
(
if
(
undefined?
column
)
(
lib.core/aggregation-clause
aggregation-operator
)
(
lib.core/aggregation-clause
aggregation-operator
column
)))
(
defn
^
:export
available-aggregation-operators
"Get the available aggregation operators for the stage with `stage-number` of
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment