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
2 changes: 1 addition & 1 deletion meerkat-browser/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devrev/meerkat-browser",
"version": "0.0.135",
"version": "0.0.136",
"dependencies": {
"tslib": "^2.3.0",
"@devrev/meerkat-core": "*",
Expand Down
2 changes: 1 addition & 1 deletion meerkat-core/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devrev/meerkat-core",
"version": "0.0.135",
"version": "0.0.136",
"dependencies": {
"tslib": "^2.3.0"
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -120,6 +120,13 @@ describe('cubeMeasureToSQLSelectString', () => {
);
});

it('should not emit a leading comma when an earlier dimension fails to resolve', () => {
const dimensions: Member[] = ['temp.unknown_dimension', 'temp.dimension1'];
const sqlToReplace = 'SELECT * FROM (SELECT * FROM TABLE_1)';
const result = applyProjectionToSQLQuery(dimensions, [], [tableSchema], sqlToReplace);
expect(result).toBe(`SELECT temp__dimension1 FROM (SELECT * FROM TABLE_1)`);
});

it('should use aliases when provided', () => {
const measures: Member[] = ['temp.measure1', 'temp.measure2'];
const sqlToReplace = 'SELECT * FROM my_table';
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -98,12 +98,9 @@ const addDimensionToSQLProjection = (
selectString: string,
tableSchemas: TableSchema[]
) => {
if (dimensions.length === 0) {
return selectString;
}
let newSelectString = selectString;
for (let i = 0; i < dimensions.length; i++) {
const dimension = dimensions[i];
const entries: string[] = [];

for (const dimension of dimensions) {
const resolved = findSchemaForMember(dimension, tableSchemas);
if (!resolved) {
continue;
Expand All @@ -122,13 +119,11 @@ const addDimensionToSQLProjection = (
if (!dimensionSchema) {
continue;
}
if (i > 0) {
newSelectString += ',';
}
// since alias key is expected to have been unfurled in the base query, we can just use it as is.
newSelectString += ` ${aliasKey}`;
entries.push(` ${aliasKey}`);
}
return newSelectString;

return selectString + entries.join(',');
};

export const getSelectReplacedSql = (sql: string, selectString: string) => {
Expand Down
2 changes: 1 addition & 1 deletion meerkat-node/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@devrev/meerkat-node",
"version": "0.0.135",
"version": "0.0.136",
"dependencies": {
"@devrev/meerkat-core": "*",
"@swc/helpers": "~0.5.0",
Expand Down
Loading