Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 3 additions & 1 deletion packages/cubejs-api-gateway/src/graphql.ts
Original file line number Diff line number Diff line change
Expand Up @@ -377,8 +377,10 @@ export function getJsonQuery(metaConfig: any, args: Record<string, any>, infos:

if (orderBy) {
Object.entries<any>(orderBy).forEach(([cubeName, members]) => {
const cubeExists = metaConfig.find((cube) => cube.config.name === cubeName);
const normalizedCubeName = cubeExists ? cubeName : capitalize(cubeName);
Object.entries<any>(members).forEach(([member, value]) => {
order.push([`${capitalize(cubeName)}.${member}`, value]);
order.push([`${normalizedCubeName}.${member}`, value]);
});
});
}
Expand Down
26 changes: 25 additions & 1 deletion packages/cubejs-api-gateway/test/graphql.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import { GraphQLObjectType } from 'graphql';
import fs from 'fs-extra';
import request from 'supertest';

import { makeSchema } from '../src/graphql';
import { makeSchema, getJsonQueryFromGraphQLQuery } from '../src/graphql';

const metaConfig = [
{
Expand Down Expand Up @@ -269,6 +269,30 @@ describe('GraphQL Schema', () => {
});
});

describe('root orderBy casing', () => {
test('preserves lowercase-first cube name when cube exists in metaConfig', () => {
const query = `query CubeQuery {
cube(orderBy: { orders: { count: desc } }) {
orders { count }
}
}`;

const jsonQuery = getJsonQueryFromGraphQLQuery(query, metaConfigSnakeCase);
expect(jsonQuery.order).toEqual([['orders.count', 'desc']]);
});

test('capitalizes cube name when cube exists under capitalized name', () => {
const query = `query CubeQuery {
cube(orderBy: { orders: { count: desc } }) {
orders { count }
}
}`;

const jsonQuery = getJsonQueryFromGraphQLQuery(query, metaConfig);
expect(jsonQuery.order).toEqual([['Orders.count', 'desc']]);
});
});

describe('extensions', () => {
const mockAnnotation = {
measures: {
Expand Down
Loading