refactor(schema-compiler): Optimize integration test container cachin…

packages/cubejs-schema-compiler/test/integration/clickhouse/ClickHouseDbRunner.ts

@@ -233,3 +233,5 @@ export class ClickHouseDbRunner extends BaseDbRunner {
     return data;
   }
 }
+
+export const dbRunner = new ClickHouseDbRunner();

packages/cubejs-schema-compiler/test/integration/clickhouse/clickhouse-dataschema-compiler.test.ts → packages/cubejs-schema-compiler/test/integration/clickhouse/clickhouse-dataschema-compiler.suite.ts

@@ -3,20 +3,14 @@ import { ClickHouseQuery } from '../../../src/adapter/ClickHouseQuery';
 import { prepareCompiler } from '../../../src/compiler/PrepareCompiler';
 
 import { prepareJsCompiler } from '../../unit/PrepareCompiler';
-import { ClickHouseDbRunner } from './ClickHouseDbRunner';
+import { dbRunner } from './ClickHouseDbRunner';
 import { logSqlAndParams } from '../../unit/TestUtil';
 
 const itif = (condition, description, fn) => (condition ? it(description, fn) : it.skip(description, fn));
 
 describe('ClickHouse DataSchemaCompiler', () => {
   jest.setTimeout(200000);
 
-  const dbRunner = new ClickHouseDbRunner();
-
-  afterAll(async () => {
-    await dbRunner.tearDown();
-  });
-
   it('gutter', () => {
     const { compiler } = prepareJsCompiler(`
     cube('visitors', {

packages/cubejs-schema-compiler/test/integration/clickhouse/clickhouse-graph-builder.test.ts → packages/cubejs-schema-compiler/test/integration/clickhouse/clickhouse-graph-builder.suite.ts

@@ -1,18 +1,12 @@
 import { UserError } from '../../../src/compiler/UserError';
 import { prepareJsCompiler } from '../../unit/PrepareCompiler';
-import { ClickHouseDbRunner } from './ClickHouseDbRunner';
+import { dbRunner } from './ClickHouseDbRunner';
 import { debugLog, logSqlAndParams } from '../../unit/TestUtil';
 import { ClickHouseQuery } from '../../../src/adapter/ClickHouseQuery';
 
 describe('ClickHouse JoinGraph', () => {
   jest.setTimeout(200000);
 
-  const dbRunner = new ClickHouseDbRunner();
-
-  afterAll(async () => {
-    await dbRunner.tearDown();
-  });
-
   const { compiler, joinGraph, cubeEvaluator } = prepareJsCompiler(`
     const perVisitorRevenueMeasure = {
       type: 'number',

packages/cubejs-schema-compiler/test/integration/clickhouse/clickhouse.test.ts

@@ -0,0 +1,10 @@
+import { dbRunner } from './ClickHouseDbRunner';
+
+import './clickhouse-dataschema-compiler.suite';
+import './clickhouse-graph-builder.suite';
+import './complex-joins.suite';
+import './custom-granularities.suite';
+
+afterAll(async () => {
+  await dbRunner.tearDown();
+});

packages/cubejs-schema-compiler/test/integration/clickhouse/complex-joins.test.ts → packages/cubejs-schema-compiler/test/integration/clickhouse/complex-joins.suite.ts

@@ -1,15 +1,9 @@
 import { prepareJsCompiler } from '../../unit/PrepareCompiler';
-import { ClickHouseDbRunner } from './ClickHouseDbRunner';
+import { dbRunner } from './ClickHouseDbRunner';
 
 describe('ClickHouse complex joins', () => {
   jest.setTimeout(20 * 1000);
 
-  const dbRunner = new ClickHouseDbRunner();
-
-  afterAll(async () => {
-    await dbRunner.tearDown();
-  });
-
   const { compiler, joinGraph, cubeEvaluator } = prepareJsCompiler(`
     cube(\`Acube\`, {
       sql: \`SELECT * FROM (SELECT 1 as id, 'Category A' as category, 10 as value UNION ALL

packages/cubejs-schema-compiler/test/integration/clickhouse/custom-granularities.test.ts → packages/cubejs-schema-compiler/test/integration/clickhouse/custom-granularities.suite.ts

@@ -1,15 +1,9 @@
 import { prepareYamlCompiler } from '../../unit/PrepareCompiler';
-import { ClickHouseDbRunner } from './ClickHouseDbRunner';
+import { dbRunner } from './ClickHouseDbRunner';
 
 describe('Custom Granularities', () => {
   jest.setTimeout(200000);
 
-  const dbRunner = new ClickHouseDbRunner();
-
-  afterAll(async () => {
-    await dbRunner.tearDown();
-  });
-
   const { compiler, joinGraph, cubeEvaluator } = prepareYamlCompiler(`
   cubes:
     - name: orders

packages/cubejs-schema-compiler/test/integration/mssql/MSSqlDbRunner.js

@@ -143,3 +143,5 @@ export class MSSqlDbRunner extends BaseDbRunner {
     return new MssqlQuery(compilers, query);
   }
 }
+
+export const dbRunner = new MSSqlDbRunner();

packages/cubejs-schema-compiler/test/integration/mssql/custom-granularities.test.ts → packages/cubejs-schema-compiler/test/integration/mssql/custom-granularities.suite.ts

@@ -1,11 +1,9 @@
 import { prepareYamlCompiler } from '../../unit/PrepareCompiler';
-import { MSSqlDbRunner } from './MSSqlDbRunner';
+import { dbRunner } from './MSSqlDbRunner';
 
 describe('Custom Granularities', () => {
   jest.setTimeout(200000);
 
-  const dbRunner = new MSSqlDbRunner();
-
   const { compiler, joinGraph, cubeEvaluator } = prepareYamlCompiler(`
   cubes:
     - name: orders

packages/cubejs-schema-compiler/test/integration/mssql/mssql-cumulative-measures.test.ts → packages/cubejs-schema-compiler/test/integration/mssql/mssql-cumulative-measures.suite.ts

@@ -1,16 +1,10 @@
 import { MssqlQuery } from '../../../src/adapter/MssqlQuery';
 import { prepareJsCompiler } from '../../unit/PrepareCompiler';
-import { MSSqlDbRunner } from './MSSqlDbRunner';
+import { dbRunner } from './MSSqlDbRunner';
 
 describe('MSSqlCumulativeMeasures', () => {
   jest.setTimeout(200000);
 
-  const dbRunner = new MSSqlDbRunner();
-
-  afterAll(async () => {
-    await dbRunner.tearDown();
-  });
-
   const { compiler, joinGraph, cubeEvaluator } = prepareJsCompiler(`
     cube(\`visitors\`, {
       sql: \`

packages/cubejs-schema-compiler/test/integration/mssql/mssql-pre-aggregations.test.ts → packages/cubejs-schema-compiler/test/integration/mssql/mssql-pre-aggregations.suite.ts

@@ -1,18 +1,12 @@
 import R from 'ramda';
 import { MssqlQuery } from '../../../src/adapter/MssqlQuery';
 import { prepareJsCompiler } from '../../unit/PrepareCompiler';
-import { MSSqlDbRunner } from './MSSqlDbRunner';
+import { dbRunner } from './MSSqlDbRunner';
 import { createJoinedCubesSchema } from '../../unit/utils';
 
 describe('MSSqlPreAggregations', () => {
   jest.setTimeout(200000);
 
-  const dbRunner = new MSSqlDbRunner();
-
-  afterAll(async () => {
-    await dbRunner.tearDown();
-  });
-
   const { compiler, joinGraph, cubeEvaluator } = prepareJsCompiler(`
     cube(\`visitors\`, {
       sql: \`

packages/cubejs-schema-compiler/test/integration/mssql/mssql-ungrouped.test.ts → packages/cubejs-schema-compiler/test/integration/mssql/mssql-ungrouped.suite.ts

@@ -1,16 +1,10 @@
 import { MssqlQuery } from '../../../src/adapter/MssqlQuery';
 import { prepareJsCompiler } from '../../unit/PrepareCompiler';
-import { MSSqlDbRunner } from './MSSqlDbRunner';
+import { dbRunner } from './MSSqlDbRunner';
 
 describe('MSSqlUngrouped', () => {
   jest.setTimeout(200000);
 
-  const dbRunner = new MSSqlDbRunner();
-
-  afterAll(async () => {
-    await dbRunner.tearDown();
-  });
-
   const { compiler, joinGraph, cubeEvaluator } = prepareJsCompiler(`
     const perVisitorRevenueMeasure = {
       type: 'number',

packages/cubejs-schema-compiler/test/integration/mssql/mssql.test.ts

@@ -0,0 +1,10 @@
+import { dbRunner } from './MSSqlDbRunner';
+
+import './custom-granularities.suite';
+import './mssql-cumulative-measures.suite';
+import './mssql-pre-aggregations.suite';
+import './mssql-ungrouped.suite';
+
+afterAll(async () => {
+  await dbRunner.tearDown();
+});

packages/cubejs-schema-compiler/test/integration/mysql/MySqlDbRunner.js

@@ -107,3 +107,5 @@ export class MySqlDbRunner extends BaseDbRunner {
     return new MysqlQuery(compilers, query);
   }
 }
+
+export const dbRunner = new MySqlDbRunner();

packages/cubejs-schema-compiler/test/integration/mysql/custom-granularities.test.ts → packages/cubejs-schema-compiler/test/integration/mysql/custom-granularities.suite.ts

@@ -1,11 +1,9 @@
 import { prepareYamlCompiler } from '../../unit/PrepareCompiler';
-import { MySqlDbRunner } from './MySqlDbRunner';
+import { dbRunner } from './MySqlDbRunner';
 
 describe('Custom Granularities', () => {
   jest.setTimeout(200000);
 
-  const dbRunner = new MySqlDbRunner();
-
   const { compiler, joinGraph, cubeEvaluator } = prepareYamlCompiler(`
   cubes:
     - name: orders

packages/cubejs-schema-compiler/test/integration/mysql/mysql-pre-aggregations.test.ts → packages/cubejs-schema-compiler/test/integration/mysql/mysql-pre-aggregations.suite.ts

@@ -1,17 +1,11 @@
 import R from 'ramda';
 import { MysqlQuery } from '../../../src/adapter/MysqlQuery';
 import { prepareJsCompiler } from '../../unit/PrepareCompiler';
-import { MySqlDbRunner } from './MySqlDbRunner';
+import { dbRunner } from './MySqlDbRunner';
 
 describe('MySqlPreAggregations', () => {
   jest.setTimeout(200000);
 
-  const dbRunner = new MySqlDbRunner();
-
-  afterAll(async () => {
-    await dbRunner.tearDown();
-  });
-
   const { compiler, joinGraph, cubeEvaluator } = prepareJsCompiler(`
     cube(\`visitors\`, {
       sql: \`

packages/cubejs-schema-compiler/test/integration/mysql/mysql.test.ts

@@ -0,0 +1,8 @@
+import { dbRunner } from './MySqlDbRunner';
+
+import './custom-granularities.suite';
+import './mysql-pre-aggregations.suite';
+
+afterAll(async () => {
+  await dbRunner.tearDown();
+});

packages/cubejs-schema-compiler/test/integration/postgres/PostgresDBRunner.js

@@ -17,7 +17,7 @@ export class PostgresDBRunner extends BaseDbRunner {
       port,
       password: this.password(),
       database: 'model_test',
-      poolSize: 1,
+      poolSize: 10,
       user: process.env.TEST_PG_USER || 'root',
     });
 
@@ -146,12 +146,11 @@ export class PostgresDBRunner extends BaseDbRunner {
           `pg_isready -h localhost -p ${this.port()} -U root -d model_test || exit 1`
         ],
         interval: 1000,
-        timeout: 500,
+        timeout: 1000,
         retries: 20,
         startPeriod: 5 * 1000,
       })
       .withWaitStrategy(Wait.forHealthCheck())
-      .withStartupTimeout(15 * 1000)
       .start();
   }
 
@@ -169,8 +168,3 @@ export class PostgresDBRunner extends BaseDbRunner {
 }
 
 export const dbRunner = new PostgresDBRunner();
-
-// eslint-disable-next-line no-undef
-afterAll(async () => {
-  await dbRunner.tearDown();
-});

packages/cubejs-schema-compiler/test/integration/postgres/postgres-core.test.ts

@@ -0,0 +1,14 @@
+import { dbRunner } from './PostgresDBRunner';
+
+// SQL generation and data schema tests
+import './async-module.suite';
+import './dataschema-compiler.suite';
+import './member-expression.suite';
+import './member-expressions-on-views.suite';
+import './sql-generation-logic.suite';
+import './sql-generation.suite';
+import './yaml-compiler.suite';
+
+afterAll(async () => {
+  await dbRunner.tearDown();
+});

packages/cubejs-schema-compiler/test/integration/postgres/postgres-misc.test.ts

@@ -0,0 +1,15 @@
+import { dbRunner } from './PostgresDBRunner';
+
+// Miscellaneous feature tests
+import './bucketing.suite';
+import './calc-groups.suite';
+import './calendars.suite';
+import './custom-granularities.suite';
+import './multi-fact-join.suite';
+import './multi-stage.suite';
+import './multiple-join-paths.suite';
+import './sub-query-dimensions.suite';
+
+afterAll(async () => {
+  await dbRunner.tearDown();
+});

packages/cubejs-schema-compiler/test/integration/postgres/postgres-pre-agg.test.ts

@@ -0,0 +1,12 @@
+import { dbRunner } from './PostgresDBRunner';
+
+// Pre-aggregation tests
+import './pre-agg-allow-non-strict.suite';
+import './pre-aggregations-alias.suite';
+import './pre-aggregations-multi-stage.suite';
+import './pre-aggregations-time.suite';
+import './pre-aggregations.suite';
+
+afterAll(async () => {
+  await dbRunner.tearDown();
+});

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

@@ -0,0 +1,14 @@
+import { dbRunner } from './PostgresDBRunner';
+
+// Views and join order tests
+import './cube-views.suite';
+import './view-deduplication.suite';
+import './views-join-order-2.suite';
+import './views-join-order-3.suite';
+import './views-join-order-join-maps.suite';
+import './views-join-order.suite';
+import './views.suite';
+
+afterAll(async () => {
+  await dbRunner.tearDown();
+});

packages/cubejs-schema-compiler/test/integration/postgres/pre-aggregations-time.test.ts → packages/cubejs-schema-compiler/test/integration/postgres/pre-aggregations-time.suite.ts

@@ -2,7 +2,7 @@
 import R from 'ramda';
 import { PostgresQuery } from '../../../src/adapter/PostgresQuery';
 import { prepareJsCompiler } from '../../unit/PrepareCompiler';
-import { PostgresDBRunner } from './PostgresDBRunner';
+import { dbRunner } from './PostgresDBRunner';
 
 const SCHEMA_VARIANTS = [
   // with references postfix
@@ -84,14 +84,11 @@ for (const [index, schema] of Object.entries(SCHEMA_VARIANTS)) {
   describe(`PreAggregations in time hierarchy (schema #${index})`, () => {
     jest.setTimeout(200000);
 
-    const dbRunner = new PostgresDBRunner();
-
-    afterAll(async () => {
-      await dbRunner.tearDown();
-    });
-
     const { compiler, joinGraph, cubeEvaluator } = prepareJsCompiler(schema);
 
+    // Use schema index as base for suffix to avoid table name conflicts between schema variants
+    const baseSuffix = `s${index}`;
+
     function replaceTableName(query, preAggregation, suffix) {
       const [toReplace, params] = query;
       console.log(toReplace);
@@ -137,7 +134,7 @@ for (const [index, schema] of Object.entries(SCHEMA_VARIANTS)) {
       console.log(JSON.stringify(queries.concat(queryAndParams)));
 
       return dbRunner.testQueries(
-        queries.concat([queryAndParams]).map(q => replaceTableName(q, preAggregationsDescription, 1))
+        queries.concat([queryAndParams]).map(q => replaceTableName(q, preAggregationsDescription, `${baseSuffix}_1`))
       ).then(res => {
         console.log(JSON.stringify(res));
         expect(res).toEqual(
@@ -197,7 +194,7 @@ for (const [index, schema] of Object.entries(SCHEMA_VARIANTS)) {
       console.log(JSON.stringify(queries.concat(queryAndParams)));
 
       return dbRunner.testQueries(
-        queries.concat([queryAndParams]).map(q => replaceTableName(q, preAggregationsDescription, 1))
+        queries.concat([queryAndParams]).map(q => replaceTableName(q, preAggregationsDescription, `${baseSuffix}_2`))
       ).then(res => {
         console.log(JSON.stringify(res));
         expect(res).toEqual(