fix tests

Author: KSDaemon

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

@@ -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);
@@ -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,
@@ -170,5 +169,5 @@ cube('D', {
     view___d_name: 'd',
     view___e_id: 4,
     view___e_name: 'e',
-  }]), { compiler, joinGraph, cubeEvaluator }));
+  }], { compiler, joinGraph, cubeEvaluator }));
 });

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

@@ -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
@@ -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"/);
@@ -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 }));
 });

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

@@ -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);
@@ -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"/);
@@ -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"/);
@@ -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"/);

packages/cubejs-schema-compiler/test/unit/utils.ts

@@ -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;
-}