mirror of
https://github.com/kremalicious/umami.git
synced 2024-11-22 09:57:00 +01:00
clean-up protocol, update getDatabaseType logic for CH
This commit is contained in:
parent
98b7624e8f
commit
c6d0fde424
@ -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}>
|
||||
|
@ -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,
|
||||
|
@ -17,6 +17,10 @@ export function getDatabaseType(url = process.env.DATABASE_URL) {
|
||||
return POSTGRESQL;
|
||||
}
|
||||
|
||||
if (process.env.CLICKHOUSE_URL) {
|
||||
return CLICKHOUSE;
|
||||
}
|
||||
|
||||
return type;
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user