Skip to content

Commit 1b5c161

Browse files
authored
feat(cubesql): Ungrouped queries support (#7056)
* feat(cubesql): Ungrouped queries support * Disable trace logging for tests as it panics * Disable trace logging for tests as it panics * Disable trace logging for tests as it panics: increase timeout
1 parent 2883873 commit 1b5c161

File tree

16 files changed

+653
-136
lines changed

16 files changed

+653
-136
lines changed

packages/cubejs-api-gateway/openspec.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -295,6 +295,8 @@ components:
295295
type: "array"
296296
items:
297297
$ref: "#/components/schemas/V1LoadRequestQueryFilterItem"
298+
ungrouped:
299+
type: "boolean"
298300
V1LoadRequest:
299301
type: "object"
300302
properties:

packages/cubejs-backend-native/test/sql.test.ts

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -12,13 +12,13 @@ const logger = jest.fn(({ event }) => {
1212
console.log(event);
1313
});
1414

15-
native.setupLogger(
16-
logger,
17-
'trace',
18-
);
15+
// native.setupLogger(
16+
// logger,
17+
// 'trace',
18+
// );
1919

2020
describe('SQLInterface', () => {
21-
jest.setTimeout(10 * 1000);
21+
jest.setTimeout(60 * 1000);
2222

2323
it('SHOW FULL TABLES FROM `db`', async () => {
2424
const load = jest.fn(async ({ request, session, query }) => {
@@ -266,11 +266,6 @@ describe('SQLInterface', () => {
266266
expect(result).toEqual([{ 'TimestampNanosecond(1608936528000000000, None)': '2020-12-25T22:48:48.000' }]);
267267
}
268268

269-
// Increment it in case you throw Error
270-
setTimeout(_ => {
271-
expect(logger.mock.calls.length).toEqual(1);
272-
}, 2000);
273-
274269
connection.destroy();
275270
} finally {
276271
await native.shutdownInterface(instance);
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
6.2.1
1+
6.6.0

rust/cubesql/cubeclient/src/models/v1_load_request_query.rs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,8 @@ pub struct V1LoadRequestQuery {
2626
pub offset: Option<i32>,
2727
#[serde(rename = "filters", skip_serializing_if = "Option::is_none")]
2828
pub filters: Option<Vec<crate::models::V1LoadRequestQueryFilterItem>>,
29+
#[serde(rename = "ungrouped", skip_serializing_if = "Option::is_none")]
30+
pub ungrouped: Option<bool>,
2931
}
3032

3133
impl V1LoadRequestQuery {
@@ -39,6 +41,7 @@ impl V1LoadRequestQuery {
3941
limit: None,
4042
offset: None,
4143
filters: None,
44+
ungrouped: None,
4245
}
4346
}
4447
}

rust/cubesql/cubesql/src/compile/builder.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,7 @@ impl QueryBuilder {
159159
} else {
160160
None
161161
},
162+
ungrouped: None,
162163
},
163164
meta: self.meta,
164165
}

rust/cubesql/cubesql/src/compile/engine/df/scan.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1201,6 +1201,7 @@ mod tests {
12011201
limit: None,
12021202
offset: None,
12031203
filters: None,
1204+
ungrouped: None,
12041205
},
12051206
wrapped_sql: None,
12061207
auth_context: Arc::new(HttpAuthContext {

0 commit comments

Comments
 (0)