Merge remote-tracking branch 'origin/dev' into dev

This commit is contained in:
Mike Cao 2023-03-08 16:38:12 -08:00
commit fcf51d9727
3 changed files with 9 additions and 4 deletions

View File

@ -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")
);

View File

@ -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,
);
}

View File

@ -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,
);
}