Skip to content

fix(backend-native): Fix result wrapper parsing #9361

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 3 commits into from
Mar 19, 2025
Merged

fix(backend-native): Fix result wrapper parsing #9361

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6f2bf64
fix(backend-native): Fix result wrapper parsing
KSDaemon Mar 18, 2025
9d51e1b
add tests
KSDaemon Mar 18, 2025
ade911c
fix tests
KSDaemon Mar 18, 2025
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
3 changes: 3 additions & 0 deletions packages/cubejs-backend-native/src/orchestrator.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -184,6 +184,9 @@ impl ValueObject for ResultWrapper {
DBResponsePrimitive::String(s) => FieldValue::String(Cow::Borrowed(s)),
DBResponsePrimitive::Number(n) => FieldValue::Number(*n),
DBResponsePrimitive::Boolean(b) => FieldValue::Bool(*b),
DBResponsePrimitive::Uncommon(v) => FieldValue::String(Cow::Owned(
serde_json::to_string(&v).unwrap_or_else(|_| v.to_string()),
)),
DBResponsePrimitive::Null => FieldValue::Null,
})
}
Expand Down
68 changes: 68 additions & 0 deletions packages/cubejs-testing/birdbox-fixtures/postgresql/schema/unusualDataTypes.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
cube('unusualDataTypes', {
sql: `SELECT
1 AS id,
100 AS amount,
'new' AS status,
'{"key": "value1", "number": 42}'::json AS json_column,
'{"key": "value1", "number": 42}'::jsonb AS jsonb_column,
ARRAY[1, 2, 3] AS array_column,
'11:22:33:44:55:66'::macaddr AS mac_address,
'192.168.0.1'::inet AS inet_column,
'192.168.0.0/24'::cidr AS cidr_column,
't'::boolean AS boolean_column,
'Hello, world!'::text AS text_column,
'1.0, 1.0'::point AS point_column,
'11111111'::bit(8) AS bit_column,
'<root><child>data</child></root>'::xml AS xml_column
UNION ALL
SELECT
2 AS id,
200 AS amount,
'new' AS status,
'{"key": "value2", "number": 84}'::json AS json_column,
'{"key": "value2", "number": 84}'::jsonb AS jsonb_column,
ARRAY[4, 5, 6] AS array_column,
'00:11:22:33:44:55'::macaddr AS mac_address,
'192.168.0.2'::inet AS inet_column,
'192.168.0.0/24'::cidr AS cidr_column,
'f'::boolean AS boolean_column,
'Goodbye, world!'::text AS text_column,
'2.0, 2.0'::point AS point_column,
'00000001'::bit(8) AS bit_column,
'<root><child>more data</child></root>'::xml AS xml_column
UNION ALL
SELECT
3 AS id,
300 AS amount,
'processed' AS status,
'{"key": "value3", "number": 168}'::json AS json_column,
'{"key": "value3", "number": 168}'::jsonb AS jsonb_column,
ARRAY[7, 8, 9] AS array_column,
'22:33:44:55:66:77'::macaddr AS mac_address,
'192.168.0.3'::inet AS inet_column,
'192.168.0.0/24'::cidr AS cidr_column,
't'::boolean AS boolean_column,
'PostgreSQL is awesome!'::text AS text_column,
'3.0, 3.0'::point AS point_column,
'11110000'::bit(8) AS bit_column,
'<root><child>even more data</child></root>'::xml AS xml_column`,
measures: {
count: { type: 'count' },
total_amount: { type: 'sum', sql: 'amount' }
},
dimensions: {
id: { type: 'number', sql: 'id', primaryKey: true },
status: { type: 'string', sql: 'status' },
json: { type: 'string', sql: 'json_column' },
jsonb: { type: 'string', sql: 'jsonb_column' },
array: { type: 'string', sql: 'array_column' },
mac_address: { type: 'string', sql: 'mac_address' },
inet_column: { type: 'string', sql: 'inet_column' },
cidr_column: { type: 'string', sql: 'cidr_column' },
boolean_column: { type: 'string', sql: 'boolean_column' },
text_column: { type: 'string', sql: 'text_column' },
point_column: { type: 'string', sql: 'point_column' },
bit_column: { type: 'string', sql: 'bit_column' },
xml_column: { type: 'string', sql: 'xml_column' },
}
});
89 changes: 89 additions & 0 deletions packages/cubejs-testing/test/__snapshots__/cli-postgresql.test.ts.snap
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,95 @@ Array [
]
`;

exports[`postgresql HTTP Transport Different column data types: Different column data types 1`] = `
Array [
Object {
"unusualDataTypes.array": Array [
1,
2,
3,
],
"unusualDataTypes.bit_column": "11111111",
"unusualDataTypes.boolean_column": true,
"unusualDataTypes.cidr_column": "192.168.0.0/24",
"unusualDataTypes.id": 1,
"unusualDataTypes.inet_column": "192.168.0.1",
"unusualDataTypes.json": Object {
"key": "value1",
"number": 42,
},
"unusualDataTypes.jsonb": Object {
"key": "value1",
"number": 42,
},
"unusualDataTypes.mac_address": "11:22:33:44:55:66",
"unusualDataTypes.point_column": Object {
"x": 1,
"y": 1,
},
"unusualDataTypes.status": "new",
"unusualDataTypes.text_column": "Hello, world!",
"unusualDataTypes.xml_column": "<root><child>data</child></root>",
},
Object {
"unusualDataTypes.array": Array [
4,
5,
6,
],
"unusualDataTypes.bit_column": "00000001",
"unusualDataTypes.boolean_column": false,
"unusualDataTypes.cidr_column": "192.168.0.0/24",
"unusualDataTypes.id": 2,
"unusualDataTypes.inet_column": "192.168.0.2",
"unusualDataTypes.json": Object {
"key": "value2",
"number": 84,
},
"unusualDataTypes.jsonb": Object {
"key": "value2",
"number": 84,
},
"unusualDataTypes.mac_address": "00:11:22:33:44:55",
"unusualDataTypes.point_column": Object {
"x": 2,
"y": 2,
},
"unusualDataTypes.status": "new",
"unusualDataTypes.text_column": "Goodbye, world!",
"unusualDataTypes.xml_column": "<root><child>more data</child></root>",
},
Object {
"unusualDataTypes.array": Array [
7,
8,
9,
],
"unusualDataTypes.bit_column": "11110000",
"unusualDataTypes.boolean_column": true,
"unusualDataTypes.cidr_column": "192.168.0.0/24",
"unusualDataTypes.id": 3,
"unusualDataTypes.inet_column": "192.168.0.3",
"unusualDataTypes.json": Object {
"key": "value3",
"number": 168,
},
"unusualDataTypes.jsonb": Object {
"key": "value3",
"number": 168,
},
"unusualDataTypes.mac_address": "22:33:44:55:66:77",
"unusualDataTypes.point_column": Object {
"x": 3,
"y": 3,
},
"unusualDataTypes.status": "processed",
"unusualDataTypes.text_column": "PostgreSQL is awesome!",
"unusualDataTypes.xml_column": "<root><child>even more data</child></root>",
},
]
`;

exports[`postgresql WS Transport #1 Orders.totalAmount: #1 Orders.totalAmount 1`] = `
Array [
Object {
Expand Down
48 changes: 37 additions & 11 deletions packages/cubejs-testing/test/abstract-test-case.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,32 @@ const asserts: [options: QueryTestOptions, query: Query][] = [
]
}
],
[
{
name: 'Different column data types'
},
{
dimensions: [
'unusualDataTypes.array',
'unusualDataTypes.bit_column',
'unusualDataTypes.boolean_column',
'unusualDataTypes.cidr_column',
'unusualDataTypes.id',
'unusualDataTypes.inet_column',
'unusualDataTypes.json',
'unusualDataTypes.jsonb',
'unusualDataTypes.mac_address',
'unusualDataTypes.point_column',
'unusualDataTypes.status',
'unusualDataTypes.text_column',
'unusualDataTypes.xml_column'
],
ungrouped: true,
order: {
'unusualDataTypes.id': 'asc'
}
}
],
];

// eslint-disable-next-line import/prefer-default-export
Expand Down Expand Up @@ -152,7 +178,7 @@ export function createBirdBoxTestCase(
let transport: WebSocketTransport;
let http: CubeApi;
let ws: CubeApi;

beforeAll(async () => {
try {
transport = new WebSocketTransport({
Expand All @@ -170,11 +196,11 @@ export function createBirdBoxTestCase(
process.exit(1);
}
});

afterAll(async () => {
await transport.close();
});

test('http+responseFormat=default', async () => {
const response = await http.load({
dimensions: ['Orders.status'],
Expand All @@ -184,7 +210,7 @@ export function createBirdBoxTestCase(
responses.push(response);
expect(response.rawData()).toMatchSnapshot('result-type');
});

test('http+responseFormat=compact option#1', async () => {
const response = await http.load({
dimensions: ['Orders.status'],
Expand All @@ -195,7 +221,7 @@ export function createBirdBoxTestCase(
responses.push(response);
expect(response.rawData()).toMatchSnapshot('result-type');
});

test('http+responseFormat=compact option#2', async () => {
const response = await http.load(
{
Expand All @@ -210,7 +236,7 @@ export function createBirdBoxTestCase(
responses.push(response);
expect(response.rawData()).toMatchSnapshot('result-type');
});

test('http+responseFormat=compact option#1+2', async () => {
const response = await http.load(
{
Expand All @@ -226,7 +252,7 @@ export function createBirdBoxTestCase(
responses.push(response);
expect(response.rawData()).toMatchSnapshot('result-type');
});

test('ws+responseFormat=default', async () => {
const response = await ws.load({
dimensions: ['Orders.status'],
Expand All @@ -236,7 +262,7 @@ export function createBirdBoxTestCase(
responses.push(response);
expect(response.rawData()).toMatchSnapshot('result-type');
});

test('ws+responseFormat=compact option#1', async () => {
const response = await ws.load({
dimensions: ['Orders.status'],
Expand All @@ -247,7 +273,7 @@ export function createBirdBoxTestCase(
responses.push(response);
expect(response.rawData()).toMatchSnapshot('result-type');
});

test('ws+responseFormat=compact option#2', async () => {
const response = await ws.load(
{
Expand All @@ -262,7 +288,7 @@ export function createBirdBoxTestCase(
responses.push(response);
expect(response.rawData()).toMatchSnapshot('result-type');
});

test('ws+responseFormat=compact option#1+2', async () => {
const response = await ws.load(
{
Expand All @@ -278,7 +304,7 @@ export function createBirdBoxTestCase(
responses.push(response);
expect(response.rawData()).toMatchSnapshot('result-type');
});

test('responses', () => {
// @ts-ignore
expect(responses[0].rawData()).toEqual(responses[1].rawData());
Expand Down
4 changes: 4 additions & 0 deletions rust/cubeorchestrator/src/query_result_transform.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -621,6 +621,7 @@ pub enum DBResponsePrimitive {
Boolean(bool),
Number(f64),
String(String),
Uncommon(Value),
}

impl Display for DBResponsePrimitive {
Expand All @@ -630,6 +631,9 @@ impl Display for DBResponsePrimitive {
DBResponsePrimitive::Boolean(b) => b.to_string(),
DBResponsePrimitive::Number(n) => n.to_string(),
DBResponsePrimitive::String(s) => s.clone(),
DBResponsePrimitive::Uncommon(v) => {
serde_json::to_string(&v).unwrap_or_else(|_| v.to_string())
}
};
write!(f, "{}", str)
}
Expand Down
Loading