ambiser
/
umami
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1356 from biqette/master 

Fix UTM request
pull/1387/head
Mike Cao 2022-08-01 20:42:56 -05:00 committed by GitHub
parent 68d35c0fc4 c8302390c5
commit b04e03b4d3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
queries/analytics/pageview/getPageviewParams.js
View File

@ -9,7 +9,7 @@ export async function getPageviewParams(...args) {
} }
function relationalQuery(param, website_id, start_at, end_at, column, table, filters = {}) { function relationalQuery(param, website_id, start_at, end_at, column, table, filters = {}) {
const params = [param, website_id, start_at, end_at]; const params = [param, param, website_id, start_at, end_at];
const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters( const { pageviewQuery, sessionQuery, eventQuery, joinSession } = parseFilters(
table, table,
column, column,
@ -26,12 +26,13 @@ function relationalQuery(param, website_id, start_at, end_at, column, table, fil
return rawQuery( return rawQuery(
`select * from ( `select * from (
select select
url, ${splitFn}(${splitFn}(url, concat($1, '='), 2), '&', 1) param url,
IF( LENGTH(url) - LENGTH(${splitFn}(url, concat($1, '='), -1)) > 1, ${splitFn}(${splitFn}(url, concat($2, '='), -1), '&', 1), null ) param
from from
pageview pageview
${joinSession} ${joinSession}
where where
${table}.website_id=$2 and ${table}.created_at between $3 and $4 ${table}.website_id=$3 and ${table}.created_at between $4 and $5
${pageviewQuery} ${pageviewQuery}
${joinSession && sessionQuery} ${joinSession && sessionQuery}
${eventQuery} ${eventQuery}