Cleanup unused interfaces

ClickHouse · Mar 11, 2024 · 3c948d0 · 3c948d0
1 parent 19eb3dd
commit 3c948d0
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 10 deletions.
diff --git a/packages/client-common/src/client.ts b/packages/client-common/src/client.ts
@@ -41,10 +41,7 @@ export interface QueryParams extends BaseQueryParams {
 export type QueryParamsWithFormat<Format extends DataFormat> = Omit<
   QueryParams,
   'format'
-> & { format: Format }
-
-/** Same parameters as {@link QueryParams}, but with `format` field omitted */
-export type QueryParamsWithoutFormat = Omit<QueryParams, 'format'>
+> & { format?: Format }
 
 export interface ExecParams extends BaseQueryParams {
   /** Statement to execute. */
@@ -147,7 +144,7 @@ export class ClickHouseClient<Stream = unknown> {
    * Returns an implementation of {@link BaseResultSet}.
    */
   async query<Format extends DataFormat = 'JSON'>(
-    params: Omit<QueryParams, 'format'> & { format?: Format }
+    params: QueryParamsWithFormat<Format>
   ): Promise<BaseResultSet<Stream, Format>> {
     const format = params.format ?? 'JSON'
     const query = formatQuery(params.query, format)

diff --git a/packages/client-common/src/index.ts b/packages/client-common/src/index.ts
@@ -81,4 +81,4 @@ export {
   formatQuerySettings,
   formatQueryParams,
 } from './data_formatter'
-export type { QueryParamsWithFormat, QueryParamsWithoutFormat } from './client'
+export type { QueryParamsWithFormat } from './client'
diff --git a/packages/client-node/src/client.ts b/packages/client-node/src/client.ts
@@ -1,4 +1,7 @@
-import type { DataFormat, QueryParams } from '@clickhouse/client-common'
+import type {
+  DataFormat,
+  QueryParamsWithFormat,
+} from '@clickhouse/client-common'
 import { ClickHouseClient } from '@clickhouse/client-common'
 import type Stream from 'stream'
 import type { NodeClickHouseClientConfigOptions } from './config'
@@ -8,7 +11,7 @@ import type { ResultSet } from './result_set'
 export class NodeClickHouseClient extends ClickHouseClient<Stream.Readable> {
   /** See the base implementation: {@link ClickHouseClient.query} */
   query<Format extends DataFormat = 'JSON'>(
-    params: Omit<QueryParams, 'format'> & { format?: Format }
+    params: QueryParamsWithFormat<Format>
   ): Promise<ResultSet<Format>> {
     return super.query(params) as Promise<ResultSet<Format>>
   }

diff --git a/packages/client-web/src/client.ts b/packages/client-web/src/client.ts
@@ -4,7 +4,7 @@ import type {
   InputJSONObjectEachRow,
   InsertParams,
   InsertResult,
-  QueryParams,
+  QueryParamsWithFormat,
 } from '@clickhouse/client-common'
 import { ClickHouseClient } from '@clickhouse/client-common'
 import type { WebClickHouseClientConfigOptions } from './config'
@@ -27,7 +27,7 @@ export type WebClickHouseClient = Omit<WebClickHouseClientImpl, 'insert'> & {
 class WebClickHouseClientImpl extends ClickHouseClient<ReadableStream> {
   /** See the base implementation: {@link ClickHouseClient.query} */
   query<Format extends DataFormat>(
-    params: Omit<QueryParams, 'format'> & { format?: Format }
+    params: QueryParamsWithFormat<Format>
   ): Promise<ResultSet<Format>> {
     return super.query(params) as Promise<ResultSet<Format>>
   }