mirror of
https://github.com/kremalicious/umami.git
synced 2024-11-15 09:45:04 +01:00
Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
fcf51d9727
@ -56,6 +56,7 @@ CREATE TABLE "website_event" (
|
||||
"referrer" VARCHAR(500),
|
||||
"event_type" INTEGER NOT NULL DEFAULT 1,
|
||||
"event_name" VARCHAR(50),
|
||||
"event_data" JSONB,
|
||||
|
||||
CONSTRAINT "website_event_pkey" PRIMARY KEY ("event_id")
|
||||
);
|
||||
|
@ -52,7 +52,8 @@ async function relationalQuery(
|
||||
and event_type = $4
|
||||
${filterQuery}
|
||||
group by 1
|
||||
order by 2 desc`,
|
||||
order by 2 desc
|
||||
limit 200`,
|
||||
params,
|
||||
);
|
||||
}
|
||||
@ -86,7 +87,8 @@ async function clickhouseQuery(
|
||||
and ${getBetweenDates('created_at', startDate, endDate)}
|
||||
${filterQuery}
|
||||
group by x
|
||||
order by y desc`,
|
||||
order by y desc
|
||||
limit 200`,
|
||||
params,
|
||||
);
|
||||
}
|
||||
|
@ -39,7 +39,8 @@ async function relationalQuery(
|
||||
${filterQuery}
|
||||
)
|
||||
group by 1
|
||||
order by 2 desc`,
|
||||
order by 2 desc
|
||||
limit 200`,
|
||||
params,
|
||||
);
|
||||
}
|
||||
@ -63,7 +64,8 @@ async function clickhouseQuery(
|
||||
and ${getBetweenDates('created_at', startDate, endDate)}
|
||||
${filterQuery}
|
||||
group by x
|
||||
order by y desc`,
|
||||
order by y desc
|
||||
limit 200`,
|
||||
params,
|
||||
);
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user