[FIXUP] get rid of compat layer

Author: mcheshkov

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

@@ -233,66 +233,33 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
   }
 
   protected queryResponse(query: string, values: unknown[]): Promise<ResponseJSON<Record<string, unknown>>> {
-    const queryResponseCompat = process.env.CUBE_CLICKHOUSE_QUERY_COMPAT === 'true';
-    const isInsert = query.trim().match(/^INSERT/i);
-
     console.log('ClickHouse queryResponse call', query);
 
     const formattedQuery = sqlstring.format(query, values);
 
     console.log('ClickHouse queryResponse prepared', formattedQuery);
 
-    return this.withCancel(async (connection, queryId) => {
-      // if (formattedQuery.startsWith("CREATE TABLE")) {
-      //
-      // }
-
-      if (queryResponseCompat && isInsert) {
-        // TODO why do we even have inserts coming to query? is it accepted contract, or just tests misbehaviour?
-        // INSERT queries does not work with `query` method due to query preparation (like adding FORMAT clause)
-        // And `insert` wants to construct query on its own
-        await connection.command({
-          query: formattedQuery,
-          query_id: queryId,
-          clickhouse_settings: this.config.clickhouseSettings,
-        });
-
-        return {
-          data: [],
-        };
-      }
+    return this.withCancel(async (connection, queryId, signal) => {
+      const format = 'JSON';
 
       const resultSet = await connection.query({
         query: formattedQuery,
         query_id: queryId,
-        format: 'JSON',
+        format,
         clickhouse_settings: this.config.clickhouseSettings,
         abort_signal: signal,
       });
       console.log("queryResponse resultSet", query, resultSet.query_id, resultSet.response_headers);
 
-      if (queryResponseCompat && resultSet.response_headers['x-clickhouse-format'] !== 'JSON') {
-        // TODO why do we even have CREATE TABLE coming to query? is it accepted contract, or just tests misbehaviour?
-        // Result set for query like CREATE TABLE would be empty, and would not even send x-clickhouse-format header field
-        // Parsing response like that as JSON would fail
-        // CREATE TABLE response header fields:
-        //       'content-type': 'text/plain; charset=UTF-8',
-        // SELECT response header fields:
-        //       'content-type': 'application/json; charset=UTF-8',
-        //       'x-clickhouse-format': 'JSON',
-        const results = await resultSet.text();
-        console.log("queryResponse text results", query, results);
-        console.log("queryResponse text results JSON", JSON.stringify(results));
-        return {
-          data: [],
-        };
-      } else {
-        // We used format JSON, so we expect each row to be Record with column names as keys
-        const results = await resultSet.json<Record<string, unknown>>();
-        console.log("queryResponse json results", query, results);
-        console.log("queryResponse json results JSON", JSON.stringify(results));
-        return results;
+      if (resultSet.response_headers['x-clickhouse-format'] !== format) {
+        throw new Error(`Unexpected x-clickhouse-format in response: expected ${format}, received ${resultSet.response_headers['x-clickhouse-format']}`);
       }
+
+      // We used format JSON, so we expect each row to be Record with column names as keys
+      const results = await resultSet.json<Record<string, unknown>>();
+      console.log("queryResponse json results", query, results);
+      console.log("queryResponse json results JSON", JSON.stringify(results));
+      return results;
     });
   }
 
@@ -376,12 +343,19 @@ export class ClickHouseDriver extends BaseDriver implements DriverInterface {
 
       console.log('ClickHouse stream prepared', formattedQuery);
 
+      const format = 'JSONCompactEachRowWithNamesAndTypes';
+
       const resultSet = await client.query({
         query: formattedQuery,
         query_id: uuidv4(),
-        format: 'JSONCompactEachRowWithNamesAndTypes',
+        format,
         clickhouse_settings: this.config.clickhouseSettings,
       });
+
+      if (resultSet.response_headers['x-clickhouse-format'] !== format) {
+        throw new Error(`Unexpected x-clickhouse-format in response: expected ${format}, received ${resultSet.response_headers['x-clickhouse-format']}`);
+      }
+
       // Array<unknown> is okay, because we use fixed JSONCompactEachRowWithNamesAndTypes format
       // And each row after first two will look like this: [42, "hello", [0,1]]
       // https://clickhouse.com/docs/en/interfaces/formats#jsoncompacteachrowwithnamesandtypes