Skip to content
Merged
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
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,9 @@ Object {
`;

exports[`GraphQL Schema with camelCase GraphQL query 6: query CubeQuery {
cube(where: { orders: { createdAt: { inDateRange: "2 weeks ago to now" } } }) {
cube(
where: { orders: { createdAt: { inDateRange: "2 weeks ago to now" } } }
) {
orders {
count
createdAt {
Expand Down Expand Up @@ -298,8 +300,7 @@ exports[`GraphQL Schema with camelCase GraphQL query 9: query CubeQuery {
status
}
}
}
1`] = `
} 1`] = `
Object {
"dimensions": Array [
"Orders.status",
Expand Down Expand Up @@ -339,6 +340,37 @@ Object {
}
`;

exports[`GraphQL Schema with camelCase GraphQL query 10: query CubeQuery {
cube(where: { orders: { createdAt: { inDateRange: "This year" } } }) {
orders(orderBy: { createdAt: asc }) {
count
createdAt {
year
}
}
}
}
1`] = `
Object {
"measures": Array [
"Orders.count",
],
"order": Array [
Array [
"Orders.createdAt",
"asc",
],
],
"timeDimensions": Array [
Object {
"dateRange": "This year",
"dimension": "Orders.createdAt",
"granularity": "year",
},
],
}
`;

exports[`GraphQL Schema with snake_case GraphQL query 0: query CubeQuery {
cube {
orders {
Expand Down Expand Up @@ -521,7 +553,9 @@ Object {
`;

exports[`GraphQL Schema with snake_case GraphQL query 6: query CubeQuery {
cube(where: { orders: { created_at: { inDateRange: "2 weeks ago to now" } } }) {
cube(
where: { orders: { created_at: { inDateRange: "2 weeks ago to now" } } }
) {
orders {
count
created_at {
Expand Down Expand Up @@ -637,8 +671,7 @@ exports[`GraphQL Schema with snake_case GraphQL query 9: query CubeQuery {
status
}
}
}
1`] = `
} 1`] = `
Object {
"dimensions": Array [
"orders.status",
Expand Down Expand Up @@ -677,3 +710,34 @@ Object {
],
}
`;

exports[`GraphQL Schema with snake_case GraphQL query 10: query CubeQuery {
cube(where: { orders: { created_at: { inDateRange: "This year" } } }) {
orders(orderBy: { created_at: asc }) {
count
created_at {
year
}
}
}
}
1`] = `
Object {
"measures": Array [
"orders.count",
],
"order": Array [
Array [
"orders.created_at",
"asc",
],
],
"timeDimensions": Array [
Object {
"dateRange": "This year",
"dimension": "orders.created_at",
"granularity": "year",
},
],
}
`;
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ query CubeQuery {
}

query CubeQuery {
cube(where: { orders: { created_at: { inDateRange: "2 weeks ago to now" } } }) {
cube(
where: { orders: { created_at: { inDateRange: "2 weeks ago to now" } } }
) {
orders {
count
created_at {
Expand Down Expand Up @@ -130,3 +132,14 @@ query CubeQuery {
}
}
}

query CubeQuery {
cube(where: { orders: { created_at: { inDateRange: "This year" } } }) {
orders(orderBy: { created_at: asc }) {
count
created_at {
year
}
}
}
}
15 changes: 14 additions & 1 deletion packages/cubejs-api-gateway/test/graphql-queries/base.gql
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,9 @@ query CubeQuery {
}

query CubeQuery {
cube(where: { orders: { createdAt: { inDateRange: "2 weeks ago to now" } } }) {
cube(
where: { orders: { createdAt: { inDateRange: "2 weeks ago to now" } } }
) {
orders {
count
createdAt {
Expand Down Expand Up @@ -130,3 +132,14 @@ query CubeQuery {
}
}
}

query CubeQuery {
cube(where: { orders: { createdAt: { inDateRange: "This year" } } }) {
orders(orderBy: { createdAt: asc }) {
count
createdAt {
year
}
}
}
}
2 changes: 1 addition & 1 deletion packages/cubejs-questdb-driver/src/QuestQuery.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const GRANULARITY_TO_INTERVAL: Record<string, string> = {
hour: 'h',
day: 'd',
month: 'M',
year: 'Y'
year: 'y'
};

class QuestParamAllocator extends ParamAllocator {
Expand Down
66 changes: 15 additions & 51 deletions packages/cubejs-questdb-driver/test/QuestDriver.test.ts
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ describe('QuestDriver', () => {
throw new Error('stream must throw an exception');
} catch (e) {
expect((e as Error).message).toEqual(
'table does not exist [name=random_name_for_table_that_doesnot_exist_sql_must_fail]'
'table does not exist [table=random_name_for_table_that_doesnot_exist_sql_must_fail]'
);
}
});
Expand All @@ -71,56 +71,20 @@ describe('QuestDriver', () => {
const schema = await driver.tablesSchema();

expect(schema['']).toEqual({
'query_test': [
{
name: 'id',
type: 'LONG',
},
{
name: 'created',
type: 'date',
},
{
name: 'price',
type: 'DOUBLE',
},
],
'telemetry': [
{
name: 'created',
type: 'TIMESTAMP',
},
{
name: 'event',
type: 'SHORT',
},
{
name: 'origin',
type: 'SHORT',
},
],
'telemetry_config': [
{
name: 'id',
type: 'LONG256',
},
{
name: 'enabled',
type: 'boolean',
},
{
name: 'version',
type: 'SYMBOL',
},
{
name: 'os',
type: 'SYMBOL',
},
{
name: 'package',
type: 'SYMBOL',
},
],
query_test: [
{
name: 'id',
type: 'LONG',
},
{
name: 'created',
type: 'date',
},
{
name: 'price',
type: 'DOUBLE',
},
],
});
});
});
Loading