clean-up protocol, update getDatabaseType logic for CH

umami-software · Sep 29, 2023 · c6d0fde · c6d0fde
1 parent 98b7624
commit c6d0fde
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 7 deletions.
diff --git a/src/components/pages/reports/Report.js b/src/components/pages/reports/Report.js
@@ -8,8 +8,6 @@ export const ReportContext = createContext(null);
 export function Report({ reportId, defaultParameters, children, ...props }) {
   const report = useReport(reportId, defaultParameters);
 
-  //console.log({ report });
-
   return (
     <ReportContext.Provider value={{ ...report }}>
       <Page {...props} className={styles.container}>

diff --git a/src/lib/clickhouse.ts b/src/lib/clickhouse.ts
@@ -25,16 +25,13 @@ function getClient() {
     hostname,
     port,
     pathname,
-    // protocol,
+    protocol,
     username = 'default',
     password,
   } = new URL(process.env.CLICKHOUSE_URL);
 
-  // const formattedProtocol =
-  //   protocol.toLowerCase() === 'clickhouse:' || protocol === 'https:' ? 'https:' : 'http:';
-
   const client = createClient({
-    host: `http://${hostname}:${port}`,
+    host: `${protocol}//${hostname}:${port}`,
     database: pathname.replace('/', ''),
     username: username,
     password,

diff --git a/src/lib/db.js b/src/lib/db.js
@@ -17,6 +17,10 @@ export function getDatabaseType(url = process.env.DATABASE_URL) {
     return POSTGRESQL;
   }
 
+  if (process.env.CLICKHOUSE_URL) {
+    return CLICKHOUSE;
+  }
+
   return type;
 }