@quillsql/admin 1.6.0 → 1.6.2

package/dist/cjs/utils/dataEditor.js

@@ -1,8 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.deleteSQLView = exports.addSqlView = exports.editSQLView = void 0;
-const constants_1 = require("./constants");
-const editSQLView = async (editName, editViewQuery, editViewId, state) => {
+exports.deleteVirtualTable = exports.addVirtualTable = exports.editVirtualTable = void 0;
+const dataFetcher_1 = require("./dataFetcher");
+const editVirtualTable = async (editName, editViewQuery, editViewId, customFieldInfo, state, ownerTenantFields, getToken, noCustomerField) => {
     if (!editName.length) {
         alert('Please enter a table name.');
         return;
@@ -15,48 +15,31 @@ const editSQLView = async (editName, editViewQuery, editViewId, state) => {
         alert('Could not save.');
         return;
     }
-    let response;
-    if (state.queryEndpoint) {
-        response = await fetch(state.queryEndpoint, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                ...state.queryHeaders,
-            },
-            body: JSON.stringify({
-                metadata: {
-                    preQueries: [editViewQuery.replace(/;/, '')],
-                    name: editName,
-                    task: 'view',
-                    id: editViewId,
-                    clientId: state.client._id,
-                    runQueryConfig: { getColumns: true },
-                    databaseType: state.client.databaseType,
-                },
-            }),
-            credentials: state.withCredentials ? 'include' : 'omit', // If withCredentials is true, set to 'include'. Otherwise, set to 'omit'.
-        });
-    }
-    else {
-        response = await fetch(`${constants_1.QUILL_SERVER}/table/${state.client._id}/`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                Authorization: `Bearer `,
-            },
-            body: JSON.stringify({
-                viewQuery: editViewQuery[editViewQuery.length - 1] === ';'
-                    ? editViewQuery.slice(0, -1)
-                    : editViewQuery,
-                name: editName,
-                id: editViewId,
-            }),
-        });
-    }
-    return await response.json();
+    return await (0, dataFetcher_1.quillFetch)({
+        client: {
+            queryEndpoint: state.queryEndpoint,
+            clientId: state.client._id,
+            withCredentials: !!state.withCredentials,
+            queryHeaders: state.queryHeaders,
+        },
+        task: 'view',
+        metadata: {
+            preQueries: [editViewQuery.replace(/;/, '')],
+            name: editName,
+            customFieldInfo: customFieldInfo,
+            id: editViewId,
+            clientId: state.client._id,
+            runQueryConfig: { getColumns: true },
+            databaseType: state.client.databaseType,
+            ownerTenantFields,
+            noCustomerField,
+            useNewNodeSql: true,
+        },
+        getToken,
+    });
 };
-exports.editSQLView = editSQLView;
-const addSqlView = async (name, editViewQuery, state) => {
+exports.editVirtualTable = editVirtualTable;
+const addVirtualTable = async (name, editViewQuery, customFieldInfo, state, ownerTenantFields, getToken, noCustomerField) => {
     if (!name.length) {
         alert('Please enter a table name.');
         return;
@@ -65,80 +48,47 @@ const addSqlView = async (name, editViewQuery, state) => {
         alert('Please enter a table query.');
         return;
     }
-    let response;
-    if (state.queryEndpoint) {
-        response = await fetch(state.queryEndpoint, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                ...state.queryHeaders,
-            },
-            body: JSON.stringify({
-                metadata: {
-                    preQueries: [editViewQuery.replace(/;/, '')],
-                    name: name,
-                    task: 'view',
-                    clientId: state.client._id,
-                    runQueryConfig: { getColumns: true },
-                    databaseType: state.client.databaseType,
-                },
-            }),
-            credentials: state.withCredentials ? 'include' : 'omit', // If withCredentials is true, set to 'include'. Otherwise, set to 'omit'.
-        });
-    }
-    else {
-        response = await fetch(`${constants_1.QUILL_SERVER}/table/${state.client._id}/`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                Authorization: `Bearer `,
-            },
-            body: JSON.stringify({
-                viewQuery: editViewQuery[editViewQuery.length - 1] === ';'
-                    ? editViewQuery.slice(0, -1)
-                    : editViewQuery,
-                name: name,
-            }),
-        });
-    }
-    return await response.json();
+    return await (0, dataFetcher_1.quillFetch)({
+        client: {
+            queryEndpoint: state.queryEndpoint,
+            clientId: state.client._id,
+            withCredentials: !!state.withCredentials,
+            queryHeaders: state.queryHeaders,
+        },
+        task: 'view',
+        metadata: {
+            preQueries: [editViewQuery.replace(/;/, '')],
+            customFieldInfo: customFieldInfo,
+            name: name,
+            clientId: state.client._id,
+            runQueryConfig: { getColumns: true },
+            databaseType: state.client.databaseType,
+            noCustomerField,
+            useNewNodeSql: true,
+            ownerTenantFields,
+        },
+        getToken,
+    });
 };
-exports.addSqlView = addSqlView;
-const deleteSQLView = async (id, state) => {
-    let response;
-    if (state.queryEndpoint) {
-        response = await fetch(state.queryEndpoint, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                ...state.queryHeaders,
-            },
-            body: JSON.stringify({
-                metadata: {
-                    task: 'view',
-                    id: id,
-                    deleted: true,
-                    clientId: state.client._id,
-                    runQueryConfig: { getColumns: true },
-                    databaseType: state.client.databaseType,
-                },
-            }),
-            credentials: state.withCredentials ? 'include' : 'omit', // If withCredentials is true, set to 'include'. Otherwise, set to 'omit'.
-        });
-    }
-    else {
-        response = await fetch(`${constants_1.QUILL_SERVER}/table/${state.client._id}/`, {
-            method: 'POST',
-            headers: {
-                'Content-Type': 'application/json',
-                Authorization: `Bearer `,
-            },
-            body: JSON.stringify({
-                id: id,
-                deleted: true,
-            }),
-        });
-    }
-    return await response.json();
+exports.addVirtualTable = addVirtualTable;
+const deleteVirtualTable = async (id, state, getToken) => {
+    return await (0, dataFetcher_1.quillFetch)({
+        client: {
+            queryEndpoint: state.queryEndpoint,
+            clientId: state.client._id,
+            withCredentials: !!state.withCredentials,
+            queryHeaders: state.queryHeaders,
+        },
+        task: 'view',
+        metadata: {
+            id: id,
+            deleted: true,
+            clientId: state.client._id,
+            runQueryConfig: { getColumns: true },
+            databaseType: state.client.databaseType,
+            useNewNodeSql: true,
+        },
+        getToken,
+    });
 };
-exports.deleteSQLView = deleteSQLView;
+exports.deleteVirtualTable = deleteVirtualTable;

package/dist/cjs/utils/dataFetcher.d.ts

@@ -1,3 +1,21 @@
-export declare function getData(client: any, cloudQueryEndpoint: string, noCred: RequestCredentials, hostedRequestBody: any, cloudRequestBody: any, method?: string): Promise<any>;
-export declare function getDataFromCloud(client: any, cloudQueryEndpoint: string, cloudRequestBody: any, method?: string): Promise<any>;
+import { QuillProviderClient } from '../Admin';
+export interface QuillFetchOptions {
+    client: Pick<QuillProviderClient, 'clientId' | 'queryEndpoint' | 'queryHeaders' | 'withCredentials'>;
+    task: string;
+    method?: string;
+    metadata: any;
+    abortSignal?: AbortSignal;
+    credentials?: RequestCredentials;
+    urlParameters?: string;
+    getToken: () => Promise<string>;
+    adminMode?: boolean;
+}
+export interface QuillResults {
+    data?: any;
+    queries?: any;
+    status?: string;
+    error?: string;
+    message?: string;
+}
+export declare const quillFetch: ({ client, task, method, metadata, abortSignal, credentials, urlParameters, getToken, }: QuillFetchOptions) => Promise<QuillResults>;
 //# sourceMappingURL=dataFetcher.d.ts.map

package/dist/cjs/utils/dataFetcher.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.tsx"],"names":[],"mappings":"AAEA,wBAAsB,OAAO,CAC3B,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,MAAM,EAAE,kBAAkB,EAC1B,iBAAiB,EAAE,GAAG,EACtB,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBAkChB;AAED,wBAAsB,gBAAgB,CACpC,MAAM,EAAE,GAAG,EACX,kBAAkB,EAAE,MAAM,EAC1B,gBAAgB,EAAE,GAAG,EACrB,MAAM,SAAS,gBAgChB"}
+{"version":3,"file":"dataFetcher.d.ts","sourceRoot":"","sources":["../../../src/utils/dataFetcher.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,mBAAmB,EAAE,MAAM,UAAU,CAAC;AAG/C,MAAM,WAAW,iBAAiB;IAChC,MAAM,EAAE,IAAI,CACV,mBAAmB,EACnB,UAAU,GAAG,eAAe,GAAG,cAAc,GAAG,iBAAiB,CAClE,CAAC;IACF,IAAI,EAAE,MAAM,CAAC;IACb,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,QAAQ,EAAE,GAAG,CAAC;IACd,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,WAAW,CAAC,EAAE,kBAAkB,CAAC;IACjC,aAAa,CAAC,EAAE,MAAM,CAAC;IACvB,QAAQ,EAAE,MAAM,OAAO,CAAC,MAAM,CAAC,CAAC;IAChC,SAAS,CAAC,EAAE,OAAO,CAAC;CACrB;AAED,MAAM,WAAW,YAAY;IAC3B,IAAI,CAAC,EAAE,GAAG,CAAC;IACX,OAAO,CAAC,EAAE,GAAG,CAAC;IACd,MAAM,CAAC,EAAE,MAAM,CAAC;IAChB,KAAK,CAAC,EAAE,MAAM,CAAC;IACf,OAAO,CAAC,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,UAAU,2FASpB,iBAAiB,KAAG,OAAO,CAAC,YAAY,CAwD1C,CAAC"}

package/dist/cjs/utils/dataFetcher.js

@@ -1,68 +1,58 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getDataFromCloud = exports.getData = void 0;
-// this function gets the data either from the self hosted endpoint or
-// our cloud server
-async function getData(client, cloudQueryEndpoint, noCred, hostedRequestBody, cloudRequestBody, method = 'POST') {
-    if (client.queryEndpoint) {
-        // self hosted
-        const resp = await fetch(client.queryEndpoint, {
-            method: 'POST',
+exports.quillFetch = void 0;
+const constants_1 = require("./constants");
+const quillFetch = async ({ client, task, method = 'POST', metadata, abortSignal, credentials = 'omit', urlParameters, getToken, }) => {
+    const token = await getToken();
+    const queryString = urlParameters ?? `task=${task}`;
+    const endpoint = client.queryEndpoint
+        ? `${client.queryEndpoint}?${queryString}`
+        : `${constants_1.QUILL_SERVER}${constants_1.QUILL_QUERY_ENDPOINT}?${queryString}`;
+    try {
+        const response = await fetch(endpoint, {
+            method,
             headers: {
+                ...(token ? { Authorization: `Bearer ${token}` } : {}),
                 ...client.queryHeaders,
                 'Content-Type': 'application/json',
+                'Vercel-Env': process.env.NEXT_PUBLIC_VERCEL_ENV ?? 'production',
             },
-            credentials: client.withCredentials ? 'include' : noCred,
-            body: JSON.stringify(hostedRequestBody),
+            body: JSON.stringify({
+                metadata: {
+                    task,
+                    clientId: client.clientId,
+                    adminMode: true,
+                    ...metadata,
+                },
+            }),
+            credentials: client.withCredentials ? 'include' : credentials,
+            signal: abortSignal,
         });
-        try {
-            const responseJson = await resp.json();
-            const result = {
-                ...responseJson.data,
-                rows: responseJson?.queries?.queryResults[0]?.rows,
-                compareRows: responseJson?.queries?.queryResults[1]?.rows,
-            };
-            return result;
+        if (!response.ok) {
+            throw new Error('API request failed');
         }
-        catch (e) {
-            console.error('Failed to parse JSON:', e);
-            return null;
+        let result = await response.json();
+        // Not sure if this is required, but putting it here just in case
+        // based on other lines of code I've seen
+        // Probably happens if self-hosted endpoint was not set up correctly and
+        // the response was wrapped in an additional data object
+        if (result.data?.data &&
+            (result.data.queries || result.data.status || result.data.error)) {
+            result = result.data;
         }
-    }
-    else {
-        // cloud
-        return await getDataFromCloud(client, cloudQueryEndpoint, cloudRequestBody, method);
-    }
-}
-exports.getData = getData;
-async function getDataFromCloud(client, cloudQueryEndpoint, cloudRequestBody, method = 'POST') {
-    const environment = client?.environment;
-    const resp = await fetch(
-    // `https://quill-344421.uc.r.appspot.com/${cloudQueryEndpoint}`,
-    `http://localhost:8080/${cloudQueryEndpoint}`, {
-        method,
-        headers: {
-            Authorization: 'Bearer ',
-            ...(environment ? { environment } : {}), // Remember to provide the actual token
-            'Content-Type': 'application/json',
-            environment: environment || undefined,
-        },
-        body: method === 'POST'
-            ? JSON.stringify({
-                ...cloudRequestBody,
-                ...{
-                    publicKey: client?._id,
-                    orgId: client?.adminCustomerId,
-                },
-            })
-            : null,
-    });
-    try {
-        return await resp.json();
+        return {
+            data: result.data,
+            queries: result.queries,
+            status: result.status,
+            error: result.error,
+        };
     }
     catch (e) {
-        console.error('Failed to parse JSON:', e);
-        return null;
+        if (e instanceof Error && e.name === 'AbortError') {
+            throw e;
+        }
+        console.error('Failed to fetch:', e);
+        return { error: 'Failed to fetch data' };
     }
-}
-exports.getDataFromCloud = getDataFromCloud;
+};
+exports.quillFetch = quillFetch;

package/dist/cjs/utils/databases.d.ts

@@ -7,39 +7,50 @@ export interface ConnectionError {
     schemas: string[];
     schemaName?: string;
 }
-interface PostgresConnection extends DatabaseConnection {
+export interface PostgresConnection extends DatabaseConnection {
     user: string;
     password: string;
     host: string;
     databaseName: string;
     port: string;
 }
-interface MySQLConnection extends DatabaseConnection {
+export interface ClickHouseConnection extends DatabaseConnection {
+    user: string;
+    password: string;
+    host: string;
+    port: string;
+}
+export interface MySQLConnection extends DatabaseConnection {
     user: string;
     password: string;
     host: string;
     databaseName: string;
     port: string;
 }
-interface SnowflakeConnection extends DatabaseConnection {
+export interface SQLServerConnection extends DatabaseConnection {
     user: string;
     password: string;
     host: string;
     databaseName: string;
     port: string;
 }
-interface BigQueryConnection extends DatabaseConnection {
-    companyTag: string;
+export interface SnowflakeConnection extends DatabaseConnection {
+    user: string;
+    password: string;
+    host: string;
+    databaseName: string;
+    warehouse: string;
+}
+export interface BigQueryConnection extends DatabaseConnection {
     jsonString: string;
 }
-export type ConnectionType = DatabaseConnection | PostgresConnection | MySQLConnection | SnowflakeConnection | BigQueryConnection;
+export type ConnectionType = DatabaseConnection | PostgresConnection | MySQLConnection | SnowflakeConnection | BigQueryConnection | ClickHouseConnection | SQLServerConnection;
 export interface DatabaseDefaultInfo {
     label: string;
     value: string;
     imageUrl: string;
 }
 export declare const DATABASE_DEFAULT_INFO: DatabaseDefaultInfo[];
-export declare function getDatabaseConnectionFormat(databaseName: string): ConnectionType | undefined;
-export declare function formConnectionString(connection?: DatabaseConnection, jsonFile?: File): string;
-export {};
+export declare function getDatabaseConnectionFormat(databaseName: string): ConnectionType;
+export declare function formConnectionString(connection?: DatabaseConnection): string;
 //# sourceMappingURL=databases.d.ts.map

package/dist/cjs/utils/databases.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"databases.d.ts","sourceRoot":"","sources":["../../../src/utils/databases.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,UAAU,kBAAmB,SAAQ,kBAAkB;IACrD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,eAAgB,SAAQ,kBAAkB;IAClD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,mBAAoB,SAAQ,kBAAkB;IACtD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,UAAU,kBAAmB,SAAQ,kBAAkB;IACrD,UAAU,EAAE,MAAM,CAAC;IACnB,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,cAAc,GACtB,kBAAkB,GAClB,kBAAkB,GAClB,eAAe,GACf,mBAAmB,GACnB,kBAAkB,CAAC;AAEvB,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,qBAAqB,EAAE,mBAAmB,EAyBtD,CAAC;AAEF,wBAAgB,2BAA2B,CACzC,YAAY,EAAE,MAAM,GACnB,cAAc,GAAG,SAAS,CAwC5B;AAED,wBAAgB,oBAAoB,CAClC,UAAU,CAAC,EAAE,kBAAkB,EAC/B,QAAQ,CAAC,EAAE,IAAI,UAyBhB"}
+{"version":3,"file":"databases.d.ts","sourceRoot":"","sources":["../../../src/utils/databases.ts"],"names":[],"mappings":"AAAA,MAAM,WAAW,kBAAkB;IACjC,IAAI,EAAE,MAAM,CAAC;IACb,gBAAgB,EAAE,MAAM,CAAC;CAC1B;AAED,MAAM,WAAW,eAAe;IAC9B,OAAO,EAAE,MAAM,CAAC;IAChB,OAAO,EAAE,MAAM,EAAE,CAAC;IAClB,UAAU,CAAC,EAAE,MAAM,CAAC;CACrB;AAED,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,oBAAqB,SAAQ,kBAAkB;IAC9D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,eAAgB,SAAQ,kBAAkB;IACzD,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAoB,SAAQ,kBAAkB;IAC7D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,IAAI,EAAE,MAAM,CAAC;CACd;AAED,MAAM,WAAW,mBAAoB,SAAQ,kBAAkB;IAC7D,IAAI,EAAE,MAAM,CAAC;IACb,QAAQ,EAAE,MAAM,CAAC;IACjB,IAAI,EAAE,MAAM,CAAC;IACb,YAAY,EAAE,MAAM,CAAC;IACrB,SAAS,EAAE,MAAM,CAAC;CACnB;AAED,MAAM,WAAW,kBAAmB,SAAQ,kBAAkB;IAC5D,UAAU,EAAE,MAAM,CAAC;CACpB;AAED,MAAM,MAAM,cAAc,GACtB,kBAAkB,GAClB,kBAAkB,GAClB,eAAe,GACf,mBAAmB,GACnB,kBAAkB,GAClB,oBAAoB,GACpB,mBAAmB,CAAC;AAExB,MAAM,WAAW,mBAAmB;IAClC,KAAK,EAAE,MAAM,CAAC;IACd,KAAK,EAAE,MAAM,CAAC;IACd,QAAQ,EAAE,MAAM,CAAC;CAClB;AAED,eAAO,MAAM,qBAAqB,EAAE,mBAAmB,EAoCtD,CAAC;AAEF,wBAAgB,2BAA2B,CACzC,YAAY,EAAE,MAAM,GACnB,cAAc,CA0DhB;AAED,wBAAgB,oBAAoB,CAAC,UAAU,CAAC,EAAE,kBAAkB,UA6CnE"}

package/dist/cjs/utils/databases.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formConnectionString = exports.getDatabaseConnectionFormat = exports.DATABASE_DEFAULT_INFO = void 0;
+exports.DATABASE_DEFAULT_INFO = void 0;
+exports.getDatabaseConnectionFormat = getDatabaseConnectionFormat;
+exports.formConnectionString = formConnectionString;
 exports.DATABASE_DEFAULT_INFO = [
     {
         label: 'PostgreSQL',
@@ -8,9 +10,19 @@ exports.DATABASE_DEFAULT_INFO = [
         imageUrl: 'https://upload.wikimedia.org/wikipedia/commons/thumb/2/29/Postgresql_elephant.svg/640px-Postgresql_elephant.svg.png',
     },
     {
-        label: 'Big Query',
-        value: 'BigQuery',
-        imageUrl: 'https://cdn.icon-icons.com/icons2/2699/PNG/512/google_bigquery_logo_icon_168150.png',
+        label: 'MySQL',
+        value: 'MySQL',
+        imageUrl: 'https://d1.awsstatic.com/asset-repository/products/amazon-rds/1024px-MySQL.ff87215b43fd7292af172e2a5d9b844217262571.png',
+    },
+    {
+        label: 'SQL Server',
+        value: 'MSSQL',
+        imageUrl: 'https://img.icons8.com/?size=512&id=laYYF3dV0Iew&format=png',
+    },
+    {
+        label: 'ClickHouse',
+        value: 'ClickHouse',
+        imageUrl: 'https://cdn.bfldr.com/TIYO9DJD/at/ngj52bwft4884275bgbgf/Logomark_Black_72dpi_FNL.png?auto=webp&format=png',
     },
     {
         label: 'Snowflake',
@@ -18,82 +30,108 @@ exports.DATABASE_DEFAULT_INFO = [
         imageUrl: 'https://estuary.dev/static/972ca52d0addb818460efc144940d25f/f8411/7154a4_Snowflake_a6a3c49601.png',
     },
     {
-        label: 'MySQL',
-        value: 'MySQL',
-        imageUrl: 'https://d1.awsstatic.com/asset-repository/products/amazon-rds/1024px-MySQL.ff87215b43fd7292af172e2a5d9b844217262571.png',
+        label: 'BigQuery',
+        value: 'BigQuery',
+        imageUrl: 'https://www.gstatic.com/bricks/image/702bc723dcfcddf8942bb459be20163106a5f64ed91404df38c73ca955f96260.svg',
     },
 ];
 function getDatabaseConnectionFormat(databaseName) {
-    if (databaseName === 'PostgreSQL') {
+    if (databaseName === 'MySQL') {
         return {
             user: '',
             password: '',
             host: '',
             databaseName: '',
             port: '',
-            type: 'PostgreSQL',
+            type: 'MySQL',
             connectionString: '',
         };
     }
-    else if (databaseName === 'MySQL') {
+    else if (databaseName === 'Snowflake') {
         return {
             user: '',
             password: '',
             host: '',
             databaseName: '',
+            warehouse: '',
+            type: 'Snowflake',
+            connectionString: '',
+        };
+    }
+    else if (databaseName === 'BigQuery') {
+        return {
+            type: 'BigQuery',
+            connectionString: '',
+            jsonString: '',
+        };
+    }
+    else if (databaseName === 'ClickHouse') {
+        return {
+            user: '',
+            password: '',
+            host: '',
             port: '',
-            type: 'MySQL',
+            type: 'ClickHouse',
             connectionString: '',
         };
     }
-    else if (databaseName === 'Snowflake') {
+    else if (databaseName === 'MSSQL') {
         return {
             user: '',
             password: '',
             host: '',
             databaseName: '',
             port: '',
-            type: 'Snowflake',
+            type: 'MSSQL',
             connectionString: '',
         };
     }
-    else if (databaseName === 'BigQuery') {
+    else {
+        // Postgres by default
         return {
-            type: 'BigQuery',
+            user: '',
+            password: '',
+            host: '',
+            databaseName: '',
+            port: '',
+            type: 'PostgreSQL',
             connectionString: '',
-            companyTag: '',
-            jsonString: '',
         };
     }
-    return undefined;
 }
-exports.getDatabaseConnectionFormat = getDatabaseConnectionFormat;
-function formConnectionString(connection, jsonFile) {
+function formConnectionString(connection) {
     if (!connection) {
         return 'There is no connection info';
     }
     if (connection.connectionString !== '') {
-        return connection.connectionString;
+        return connection.connectionString.replaceAll(' ', '');
     }
     if (connection.type === 'PostgreSQL') {
         const typedConnection = connection;
-        return `postgres://${typedConnection.user}:${typedConnection.password}@${typedConnection.host}:${typedConnection.port}/${typedConnection.databaseName}`;
+        return `postgres://${typedConnection.user}:${typedConnection.password}@${typedConnection.host}:${typedConnection.port}/${typedConnection.databaseName}`.replaceAll(' ', '');
     }
-    else if (connection.type === 'mysql') {
+    else if (connection.type === 'MySQL') {
         const typedConnection = connection;
-        return `mysql://${typedConnection.user}:${typedConnection.password}@${typedConnection.host}:${typedConnection.port}`;
+        return `mysql://${typedConnection.user}:${typedConnection.password}@${typedConnection.host}:${typedConnection.port}/${typedConnection.databaseName}`.replaceAll(' ', '');
     }
-    else if (connection.type === 'snowflake') {
+    else if (connection.type === 'Snowflake') {
         const typedConnection = connection;
-        return `mysql://${typedConnection.user}:${typedConnection.password}@${typedConnection.host}:${typedConnection.port}`;
+        return `snowflake://${typedConnection.user}:${typedConnection.password}@${typedConnection.host}/${typedConnection.databaseName}/${typedConnection.warehouse}`.replaceAll(' ', '');
     }
     else if (connection.type === 'BigQuery') {
         const typedConnection = connection;
         const cleanedJsonString = typedConnection.jsonString
             .replace(/\\(?![n"])/g, '')
             .replace(/\n/g, '');
-        return `${typedConnection.companyTag}${cleanedJsonString}`;
+        return cleanedJsonString;
+    }
+    else if (connection.type === 'ClickHouse') {
+        const typedConnection = connection;
+        return `https://${typedConnection.user}:${typedConnection.password}@${typedConnection.host}:${typedConnection.port}/`.replaceAll(' ', '');
+    }
+    else if (connection.type === 'MSSQL') {
+        const typedConnection = connection;
+        return `mssql://${typedConnection.user}:${typedConnection.password}@${typedConnection.host}:${typedConnection.port}/${typedConnection.databaseName}`.replaceAll(' ', '');
     }
     return '';
 }
-exports.formConnectionString = formConnectionString;