Skip to content

fix(tesseract): Fix member name case conversion #10064

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 4 commits into from
Oct 21, 2025
Merged

fix(tesseract): Fix member name case conversion #10064

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
42fec38
fix(tesseract): Fix member name case conversion
KSDaemon Oct 17, 2025
c59878f
add tests
KSDaemon Oct 17, 2025
36814a5
fix tests
KSDaemon Oct 17, 2025
32cc848
cargo fmt
KSDaemon Oct 17, 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
75 changes: 75 additions & 0 deletions packages/cubejs-schema-compiler/test/integration/postgres/sql-generation.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -361,6 +361,31 @@ describe('SQL Generation', () => {
type: 'string',
sql: 'source'
},
// dimensions for testing letter cases
my_favorite_source: {
type: 'string',
sql: 'source'
},
My_favorite_source: {
type: 'string',
sql: 'source'
},
MY_favorite_source: {
type: 'string',
sql: 'source'
},
My_Favorite_Source: {
type: 'string',
sql: 'source'
},
MY_Favorite_SOURCE: {
type: 'string',
sql: 'source'
},
MY_FAVORITE_SOURCE: {
type: 'string',
sql: 'source'
},
created_at: {
type: 'time',
sql: 'created_at',
Expand Down Expand Up @@ -5372,4 +5397,54 @@ cubes:
]);
});
});

it('Checking member name letter cases', async () => {
await compiler.compile();

const query = new PostgresQuery({ joinGraph, cubeEvaluator, compiler }, {
measures: [],
dimensions: [
'visitors.my_favorite_source',
'visitors.My_favorite_source',
'visitors.MY_favorite_source',
'visitors.My_Favorite_Source',
'visitors.MY_Favorite_SOURCE',
'visitors.MY_FAVORITE_SOURCE',
],
order: [{
id: 'visitors.created_at'
}],
timezone: 'America/Los_Angeles'
});

const res = await dbRunner.testQuery(query.buildSqlAndParams());
console.log(JSON.stringify(res));

expect(res).toEqual([
{
visitors___m_y__f_a_v_o_r_i_t_e__s_o_u_r_c_e: null,
visitors___m_y__favorite__s_o_u_r_c_e: null,
visitors___m_y_favorite_source: null,
visitors___my__favorite__source: null,
visitors___my_favorite_source: null,
visitors__my_favorite_source: null,
},
{
visitors___m_y__f_a_v_o_r_i_t_e__s_o_u_r_c_e: 'google',
visitors___m_y__favorite__s_o_u_r_c_e: 'google',
visitors___m_y_favorite_source: 'google',
visitors___my__favorite__source: 'google',
visitors___my_favorite_source: 'google',
visitors__my_favorite_source: 'google',
},
{
visitors___m_y__f_a_v_o_r_i_t_e__s_o_u_r_c_e: 'some',
visitors___m_y__favorite__s_o_u_r_c_e: 'some',
visitors___m_y_favorite_source: 'some',
visitors___my__favorite__source: 'some',
visitors___my_favorite_source: 'some',
visitors__my_favorite_source: 'some',
},
]);
});
});
5 changes: 2 additions & 3 deletions packages/cubejs-schema-compiler/test/integration/postgres/views-join-order-2.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { prepareJsCompiler } from '../../unit/PrepareCompiler';
import { dbRunner } from './PostgresDBRunner';
import { transformResultsForTesseractIfNeeded } from '../../unit/utils';

describe('Views Join Order 2', () => {
jest.setTimeout(200000);
Expand Down Expand Up @@ -161,7 +160,7 @@ cube('D', {
total: true,
renewQuery: false,
limit: 1
}, transformResultsForTesseractIfNeeded([{
}, [{
view___a_id: 1,
view___a_name: 'a',
view___b_id: 2,
Expand All @@ -170,5 +169,5 @@ cube('D', {
view___d_name: 'd',
view___e_id: 4,
view___e_name: 'e',
}]), { compiler, joinGraph, cubeEvaluator }));
}], { compiler, joinGraph, cubeEvaluator }));
});
21 changes: 10 additions & 11 deletions packages/cubejs-schema-compiler/test/integration/postgres/views-join-order-3.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { prepareJsCompiler } from '../../unit/PrepareCompiler';
import { dbRunner } from './PostgresDBRunner';
import { transformResultsForTesseractIfNeeded } from '../../unit/utils';

/**
* This tests the cube join correctness for cases, when there are
Expand Down Expand Up @@ -126,9 +125,9 @@ view(\`V\`, {
timeDimensions: [],
segments: [],
filters: [],
}, transformResultsForTesseractIfNeeded([{
}, [{
b___activity_balance: 125,
}]), { compiler, joinGraph, cubeEvaluator });
}], { compiler, joinGraph, cubeEvaluator });

expect(sql).toMatch(/AS "b"/);
expect(sql).toMatch(/AS "d"/);
Expand All @@ -143,36 +142,36 @@ view(\`V\`, {
timeDimensions: [],
segments: [],
filters: [],
}, transformResultsForTesseractIfNeeded([{
}, [{
v___activity_balance: 125,
}]), { compiler, joinGraph, cubeEvaluator }));
}], { compiler, joinGraph, cubeEvaluator }));

it('correct join for simple view F-dimension', async () => dbRunner.runQueryTest({
dimensions: ['V.PlanCode'],
timeDimensions: [],
segments: [],
filters: [],
}, transformResultsForTesseractIfNeeded([{
}, [{
v___plan_code: 'PLAN_CODE',
}]), { compiler, joinGraph, cubeEvaluator }));
}], { compiler, joinGraph, cubeEvaluator }));

it('correct join for view F-dimension + B-dimension', async () => dbRunner.runQueryTest({
dimensions: ['V.PlanCode', 'V.ActivityBalance'],
timeDimensions: [],
segments: [],
filters: [],
}, transformResultsForTesseractIfNeeded([{
}, [{
v___plan_code: 'PLAN_CODE',
v___activity_balance: 125,
}]), { compiler, joinGraph, cubeEvaluator }));
}], { compiler, joinGraph, cubeEvaluator }));

it('correct join for view B-dimension + F-dimension', async () => dbRunner.runQueryTest({
dimensions: ['V.ActivityBalance', 'V.PlanCode'],
timeDimensions: [],
segments: [],
filters: [],
}, transformResultsForTesseractIfNeeded([{
}, [{
v___activity_balance: 125,
v___plan_code: 'PLAN_CODE',
}]), { compiler, joinGraph, cubeEvaluator }));
}], { compiler, joinGraph, cubeEvaluator }));
});
13 changes: 6 additions & 7 deletions packages/cubejs-schema-compiler/test/integration/postgres/views-join-order-join-maps.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,5 @@
import { prepareJsCompiler } from '../../unit/PrepareCompiler';
import { dbRunner } from './PostgresDBRunner';
import { transformResultsForTesseractIfNeeded } from '../../unit/utils';

describe('Views Join Order using join maps', () => {
jest.setTimeout(200000);
Expand Down Expand Up @@ -140,11 +139,11 @@ cube('D', {
segments: [],
filters: [],
total: true,
}, transformResultsForTesseractIfNeeded([{
}, [{
view___a_id: 1,
view___a_name: 'a',
view___a_d_name: 'd3',
}]), { compiler, joinGraph, cubeEvaluator });
}], { compiler, joinGraph, cubeEvaluator });

expect(sql).toMatch(/AS "b"/);
expect(sql).toMatch(/AS "c"/);
Expand All @@ -166,11 +165,11 @@ cube('D', {
segments: [],
filters: [],
total: true,
}, transformResultsForTesseractIfNeeded([{
}, [{
view___a_id: 1,
view___a_name: 'a',
view___a_c_name: 'c1',
}]), { compiler, joinGraph, cubeEvaluator });
}], { compiler, joinGraph, cubeEvaluator });

expect(sql).toMatch(/AS "b"/);
expect(sql).toMatch(/AS "c"/);
Expand All @@ -193,12 +192,12 @@ cube('D', {
segments: [],
filters: [],
total: true,
}, transformResultsForTesseractIfNeeded([{
}, [{
view___a_id: 1,
view___a_name: 'a',
view___a_c_name: 'c1',
view___a_d_name: 'd3',
}]), { compiler, joinGraph, cubeEvaluator });
}], { compiler, joinGraph, cubeEvaluator });

expect(sql).toMatch(/AS "b"/);
expect(sql).toMatch(/AS "c"/);
Expand Down
15 changes: 0 additions & 15 deletions packages/cubejs-schema-compiler/test/unit/utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -769,18 +769,3 @@ export function createJoinedCubesSchema(): string {
});
`;
}

export function transformResultsForTesseractIfNeeded(results: Record<string, any>[]) {
if (getEnv('nativeSqlPlanner')) {
return results.map(record => {
const fixedRecord: Record<string, any> = {};
for (const [key, value] of Object.entries(record)) {
const fixedKey = key.replace(/___/g, '__');
fixedRecord[fixedKey] = value;
}
return fixedRecord;
});
}

return results;
}
14 changes: 13 additions & 1 deletion rust/cubesqlplanner/cubesqlplanner/src/planner/sql_templates/plan.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -161,10 +161,22 @@ impl PlanSqlTemplates {
} else {
format!("")
};

// For strange reasons, the javascript snake caser used in cube
// changes first UPPERCASE letter to "_lowercase", prepending "_"
// This is weird, but to be compatible we have to add it too.
let mut member_alias = Self::alias_name(name);

if let Some(fl) = name.chars().next() {
if fl.is_uppercase() {
member_alias = format!("_{}", member_alias);
}
}

format!(
"{}__{}{}",
Self::alias_name(cube_name),
Self::alias_name(name),
member_alias,
suffix
)
}
Expand Down
Loading