[FIXUP] add separate createTableRaw, fix override for createTable

Author: mcheshkov

packages/cubejs-base-driver/src/BaseDriver.ts

@@ -614,9 +614,14 @@ export abstract class BaseDriver implements DriverInterface {
     return [];
   }
 
-  public createTable(quotedTableName: string, columns: TableColumn[]) {
+  // This is only for use in tests
+  public async createTableRaw(query: string): Promise<void> {
+    await this.query(query);
+  }
+
+  public async createTable(quotedTableName: string, columns: TableColumn[]): Promise<void> {
     const createTableSql = this.createTableSql(quotedTableName, columns);
-    return this.query(createTableSql, []).catch(e => {
+    await this.query(createTableSql, []).catch(e => {
       e.message = `Error during create table: ${createTableSql}: ${e.message}`;
       throw e;
     });

packages/cubejs-clickhouse-driver/src/ClickHouseDriver.ts

@@ -19,6 +19,7 @@ import {
   QuerySchemasResult,
   StreamOptions,
   StreamTableDataWithTypes,
+  TableColumn,
   TableQueryResult,
   TableStructure,
   UnloadOptions,
@@ -650,6 +651,20 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
     }));
   }
 
+  // This is only for use in tests
+  public override async createTableRaw(query: string): Promise<void> {
+    await this.command(query);
+  }
+
+  public override async createTable(quotedTableName: string, columns: TableColumn[]) {
+    const createTableSql = this.createTableSql(quotedTableName, columns);
+    try {
+      await this.command(createTableSql);
+    } catch (e) {
+      throw new Error(`Error during create table: ${createTableSql}`, {cause: e});
+    }
+  }
+
   /**
    * We use unloadWithoutTempTable strategy
    */
@@ -712,7 +727,7 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
     };
   }
 
-  // This is not part of a driver interface, and should be used only for testing
+  // This is not part of a driver interface, and marked public only for testing
   public async command(query: string): Promise<void> {
     await this.withConnection(async (connection) => {
       await connection.command({
@@ -721,7 +736,7 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
     });
   }
 
-  // This is not part of a driver interface, and should be used only for testing
+  // This is not part of a driver interface, and marked public only for testing
   public async insert(table: string, values: Array<Array<unknown>>): Promise<void> {
     await this.withConnection(async (connection) => {
       await connection.insert({

packages/cubejs-testing-drivers/src/tests/testQueries.ts

@@ -117,7 +117,7 @@ export function testQueries(type: string, { includeIncrementalSchemaSuite, exten
       console.log(`Creating ${queries.length} fixture tables`);
       try {
         for (const q of queries) {
-          await driver.query(q);
+          await driver.createTableRaw(q);
         }
         console.log(`Creating ${queries.length} fixture tables completed`);
       } catch (e: any) {