|
|
|
@ -157,33 +157,30 @@ defmodule Plausible.Stats.Base do
|
|
|
|
|
|
|
|
|
|
|
|
Enum.reduce(Filters.visit_props(), sessions_q, fn prop_name, sessions_q ->
|
|
|
|
Enum.reduce(Filters.visit_props(), sessions_q, fn prop_name, sessions_q ->
|
|
|
|
filter = query.filters["visit:" <> prop_name]
|
|
|
|
filter = query.filters["visit:" <> prop_name]
|
|
|
|
prop_name = Map.get(@api_prop_name_to_db, prop_name, prop_name)
|
|
|
|
|
|
|
|
|
|
|
|
prop_name =
|
|
|
|
|
|
|
|
Map.get(@api_prop_name_to_db, prop_name, prop_name)
|
|
|
|
|
|
|
|
|> String.to_existing_atom()
|
|
|
|
|
|
|
|
|
|
|
|
case filter do
|
|
|
|
case filter do
|
|
|
|
{:is, value} ->
|
|
|
|
{:is, value} ->
|
|
|
|
where_target = [{String.to_existing_atom(prop_name), db_prop_val(prop_name, value)}]
|
|
|
|
value = db_prop_val(prop_name, value)
|
|
|
|
from(s in sessions_q, where: ^where_target)
|
|
|
|
from(s in sessions_q, where: fragment("? = ?", field(s, ^prop_name), ^value))
|
|
|
|
|
|
|
|
|
|
|
|
{:is_not, value} ->
|
|
|
|
{:is_not, value} ->
|
|
|
|
fragment_data = [
|
|
|
|
value = db_prop_val(prop_name, value)
|
|
|
|
{String.to_existing_atom(prop_name), {:!=, db_prop_val(prop_name, value)}}
|
|
|
|
from(s in sessions_q, where: fragment("? != ?", field(s, ^prop_name), ^value))
|
|
|
|
]
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
from(s in sessions_q, where: fragment(^fragment_data))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{:member, values} ->
|
|
|
|
{:member, values} ->
|
|
|
|
list = Enum.map(values, &db_prop_val(prop_name, &1))
|
|
|
|
list = Enum.map(values, &db_prop_val(prop_name, &1))
|
|
|
|
fragment_data = [{String.to_existing_atom(prop_name), {:in, list}}]
|
|
|
|
from(s in sessions_q, where: fragment("? in tuple(?)", field(s, ^prop_name), ^list))
|
|
|
|
from(s in sessions_q, where: fragment(^fragment_data))
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
{:matches, expr} ->
|
|
|
|
{:matches, expr} ->
|
|
|
|
regex = page_regex(expr)
|
|
|
|
regex = page_regex(expr)
|
|
|
|
prop_name = String.to_existing_atom(prop_name)
|
|
|
|
|
|
|
|
from(s in sessions_q, where: fragment("match(?, ?)", field(s, ^prop_name), ^regex))
|
|
|
|
from(s in sessions_q, where: fragment("match(?, ?)", field(s, ^prop_name), ^regex))
|
|
|
|
|
|
|
|
|
|
|
|
{:does_not_match, expr} ->
|
|
|
|
{:does_not_match, expr} ->
|
|
|
|
regex = page_regex(expr)
|
|
|
|
regex = page_regex(expr)
|
|
|
|
prop_name = String.to_existing_atom(prop_name)
|
|
|
|
|
|
|
|
from(s in sessions_q, where: fragment("not(match(?, ?))", field(s, ^prop_name), ^regex))
|
|
|
|
from(s in sessions_q, where: fragment("not(match(?, ?))", field(s, ^prop_name), ^regex))
|
|
|
|
|
|
|
|
|
|
|
|
nil ->
|
|
|
|
nil ->
|
|
|
|
@ -310,11 +307,11 @@ defmodule Plausible.Stats.Base do
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
end
|
|
|
|
|
|
|
|
|
|
|
|
defp db_prop_val("referrer_source", @no_ref), do: ""
|
|
|
|
defp db_prop_val(:referrer_source, @no_ref), do: ""
|
|
|
|
defp db_prop_val("referrer", @no_ref), do: ""
|
|
|
|
defp db_prop_val(:referrer, @no_ref), do: ""
|
|
|
|
defp db_prop_val("utm_medium", @no_ref), do: ""
|
|
|
|
defp db_prop_val(:utm_medium, @no_ref), do: ""
|
|
|
|
defp db_prop_val("utm_source", @no_ref), do: ""
|
|
|
|
defp db_prop_val(:utm_source, @no_ref), do: ""
|
|
|
|
defp db_prop_val("utm_campaign", @no_ref), do: ""
|
|
|
|
defp db_prop_val(:utm_campaign, @no_ref), do: ""
|
|
|
|
defp db_prop_val(_, val), do: val
|
|
|
|
defp db_prop_val(_, val), do: val
|
|
|
|
|
|
|
|
|
|
|
|
defp utc_boundaries(%Query{period: "realtime"}, _timezone) do
|
|
|
|
defp utc_boundaries(%Query{period: "realtime"}, _timezone) do
|
|
|
|
|