style: use isNode flag

hyperdxio · Jan 9, 2025 · 0a6714f · 0a6714f
1 parent 91a31fd
commit 0a6714f
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 7 deletions.
diff --git a/packages/api/src/common/clickhouse.ts b/packages/api/src/common/clickhouse.ts
@@ -5,10 +5,9 @@ import {
   ResponseJSON,
 } from '@clickhouse/client-common';
 
-import { client as internalClickhouseClient } from '@/clickhouse';
 import { SQLInterval } from '@/common/sqlTypes';
 import { hashCode } from '@/common/utils';
-import { timeBucketByGranularity } from '@/common/utils';
+import { isNode, timeBucketByGranularity } from '@/common/utils';
 import * as config from '@/config';
 
 export const PROXY_CLICKHOUSE_HOST = '/api/clickhouse-proxy';
@@ -357,7 +356,6 @@ export const sendQuery = async <T extends DataFormat>({
   clickhouse_settings,
   connectionId,
   queryId,
-  useNativeClient,
 }: {
   query: string;
   format?: string;
@@ -366,11 +364,10 @@ export const sendQuery = async <T extends DataFormat>({
   clickhouse_settings?: Record<string, any>;
   connectionId: string;
   queryId?: string;
-  useNativeClient?: boolean;
 }) => {
-  // TODO: switch to internal client in CI for now
-  if (useNativeClient || config.IS_CI) {
-    return internalClickhouseClient.query({
+  if (isNode) {
+    const _clickhouse = await import('@/clickhouse');
+    return _clickhouse.client.query({
       query,
       query_params,
       abort_signal,

diff --git a/packages/api/src/common/utils.ts b/packages/api/src/common/utils.ts
@@ -3,6 +3,14 @@ import { add } from 'date-fns';
 
 import type { SQLInterval } from '@/common/sqlTypes';
 
+export const isBrowser: boolean =
+  typeof window !== 'undefined' && typeof window.document !== 'undefined';
+
+export const isNode: boolean =
+  typeof process !== 'undefined' &&
+  process.versions != null &&
+  process.versions.node != null;
+
 // If a user specifies a timestampValueExpression with multiple columns,
 // this will return the first one. We'll want to refine this over time
 export function getFirstTimestampValueExpression(valueExpression: string) {