diff --git a/lib/plausible/stats/base.ex b/lib/plausible/stats/base.ex index 70c0d2fc0..e92464d32 100644 --- a/lib/plausible/stats/base.ex +++ b/lib/plausible/stats/base.ex @@ -606,7 +606,7 @@ defmodule Plausible.Stats.Base do |> select([e], total_visitors: fragment(@uniq_users_expression, e.user_id)) end - defp total_visitors_subquery(site, %Query{include_imported: true} = query) do + def total_visitors_subquery(site, %Query{include_imported: true} = query) do dynamic( [e], selected_as( @@ -617,7 +617,7 @@ defmodule Plausible.Stats.Base do ) end - defp total_visitors_subquery(site, query) do + def total_visitors_subquery(site, query) do dynamic([e], selected_as(subquery(total_visitors(site, query)), :__total_visitors)) end diff --git a/lib/plausible/stats/breakdown.ex b/lib/plausible/stats/breakdown.ex index c500cf87c..c2acc6e47 100644 --- a/lib/plausible/stats/breakdown.ex +++ b/lib/plausible/stats/breakdown.ex @@ -846,26 +846,18 @@ defmodule Plausible.Stats.Breakdown do if :conversion_rate in metrics do total_query = query |> Query.remove_event_filters([:goal, :props]) - total_q = - from(e in base_event_query(site, total_query), - select: %{ - total_visitors: fragment("toUInt64(round(uniq(?) * any(_sample_factor)))", e.user_id) - } - ) - # :TRICKY: Subquery is used due to event:goal breakdown above doing an UNION ALL - from(e in subquery(q), - select_merge: %{ - total_visitors: selected_as(subquery(total_q), :total_visitors), - conversion_rate: - fragment( - "if(? > 0, round(? / ? * 100, 1), null)", - selected_as(:total_visitors), - e.visitors, - selected_as(:total_visitors) - ) - } - ) + subquery(q) + |> select_merge(^%{total_visitors: total_visitors_subquery(site, total_query)}) + |> select_merge([e], %{ + conversion_rate: + fragment( + "if(? > 0, round(? / ? * 100, 1), null)", + selected_as(:__total_visitors), + e.visitors, + selected_as(:__total_visitors) + ) + }) else q end