Skip to content

Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.

Remove SAMPLE BY from an events query that joins sessions (#4341)

Karl-Aksel Puulmann3ab47e6401c3
diff --git a/lib/plausible/stats/sql/query_builder.ex b/lib/plausible/stats/sql/query_builder.ex
index 4a7d801fb2..3d1d38f085 100644
--- a/lib/plausible/stats/sql/query_builder.ex
+++ b/lib/plausible/stats/sql/query_builder.ex
@@ -8,7 +8,7 @@ defmodule Plausible.Stats.SQL.QueryBuilder do
import Plausible.Stats.Imported
import Plausible.Stats.Util
- alias Plausible.Stats.{Base, Filters, Query, QueryOptimizer, TableDecider, SQL}
+ alias Plausible.Stats.{Filters, Query, QueryOptimizer, TableDecider, SQL}
alias Plausible.Stats.SQL.Expression
require Plausible.Stats.SQL.Expression
@@ -50,9 +50,10 @@ defmodule Plausible.Stats.SQL.QueryBuilder do
if TableDecider.events_join_sessions?(query) do
sessions_q =
from(
- s in Base.query_sessions(site, query),
- select: %{session_id: s.session_id},
+ s in "sessions_v2",
+ where: ^SQL.WhereBuilder.build(:sessions, site, query),
where: s.sign == 1,
+ select: %{session_id: s.session_id},
group_by: s.session_id
)