Skip to content

Commit 47ff99b

Browse files
committed
refactor tests
1 parent 7924a54 commit 47ff99b

File tree

4 files changed

+162
-290
lines changed

4 files changed

+162
-290
lines changed

packages/cubejs-schema-compiler/test/integration/postgres/views-join-order-2.test.ts

Lines changed: 28 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
import { getEnv } from '@cubejs-backend/shared';
22
import { prepareJsCompiler } from '../../unit/PrepareCompiler';
33
import { dbRunner } from './PostgresDBRunner';
4+
import { transformResultsForTesseractIfNeeded } from '../../unit/utils';
45

56
describe('Views Join Order 2', () => {
67
jest.setTimeout(200000);
@@ -144,61 +145,31 @@ cube('D', {
144145
});
145146
`);
146147

147-
if (getEnv('nativeSqlPlanner')) {
148-
it('join order', async () => dbRunner.runQueryTest({
149-
dimensions: [
150-
'View.A_id',
151-
'View.A_name',
152-
'View.B_id',
153-
'View.B_name',
154-
'View.D_id',
155-
'View.D_name',
156-
'View.E_id',
157-
'View.E_name'
158-
],
159-
timeDimensions: [],
160-
segments: [],
161-
filters: [],
162-
total: true,
163-
renewQuery: false,
164-
limit: 1
165-
}, [{
166-
view__a_id: 1,
167-
view__a_name: 'a',
168-
view__b_id: 2,
169-
view__b_name: 'b',
170-
view__d_id: 3,
171-
view__d_name: 'd',
172-
view__e_id: 4,
173-
view__e_name: 'e',
174-
}], { compiler, joinGraph, cubeEvaluator }));
175-
} else {
176-
it('join order', async () => dbRunner.runQueryTest({
177-
dimensions: [
178-
'View.A_id',
179-
'View.A_name',
180-
'View.B_id',
181-
'View.B_name',
182-
'View.D_id',
183-
'View.D_name',
184-
'View.E_id',
185-
'View.E_name'
186-
],
187-
timeDimensions: [],
188-
segments: [],
189-
filters: [],
190-
total: true,
191-
renewQuery: false,
192-
limit: 1
193-
}, [{
194-
view___a_id: 1,
195-
view___a_name: 'a',
196-
view___b_id: 2,
197-
view___b_name: 'b',
198-
view___d_id: 3,
199-
view___d_name: 'd',
200-
view___e_id: 4,
201-
view___e_name: 'e',
202-
}], { compiler, joinGraph, cubeEvaluator }));
203-
}
148+
it('join order', async () => dbRunner.runQueryTest({
149+
dimensions: [
150+
'View.A_id',
151+
'View.A_name',
152+
'View.B_id',
153+
'View.B_name',
154+
'View.D_id',
155+
'View.D_name',
156+
'View.E_id',
157+
'View.E_name'
158+
],
159+
timeDimensions: [],
160+
segments: [],
161+
filters: [],
162+
total: true,
163+
renewQuery: false,
164+
limit: 1
165+
}, transformResultsForTesseractIfNeeded([{
166+
view___a_id: 1,
167+
view___a_name: 'a',
168+
view___b_id: 2,
169+
view___b_name: 'b',
170+
view___d_id: 3,
171+
view___d_name: 'd',
172+
view___e_id: 4,
173+
view___e_name: 'e',
174+
}]), { compiler, joinGraph, cubeEvaluator }));
204175
});

0 commit comments

Comments
 (0)