m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

clean-up protocol, update getDatabaseType logic for CH

Browse Source
This commit is contained in:
Francis Cao 2023-09-29 11:22:13 -07:00
parent be353d5555
commit ce0a90e341
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/components/pages/reports/Report.js
View File

@ -8,8 +8,6 @@ export const ReportContext = createContext(null);
export function Report({ reportId, defaultParameters, children, ...props }) { export function Report({ reportId, defaultParameters, children, ...props }) {
const report = useReport(reportId, defaultParameters); const report = useReport(reportId, defaultParameters);
//console.log({ report });
return ( return (
<ReportContext.Provider value={{ ...report }}> <ReportContext.Provider value={{ ...report }}>
<Page {...props} className={styles.container}> <Page {...props} className={styles.container}>

7
src/lib/clickhouse.ts
View File

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

4
src/lib/db.js
View File

@ -17,6 +17,10 @@ export function getDatabaseType(url = process.env.DATABASE_URL) {
return POSTGRESQL; return POSTGRESQL;
} }
if (process.env.CLICKHOUSE_URL) {
return CLICKHOUSE;
}
return type; return type;
} }