Clean up some rebase mistakes

pull/2773/head
Uku Taht 4 years ago
parent a725be0371
commit 6642a4c14e

@ -77,12 +77,6 @@ defmodule Plausible.Stats.Aggregate do
{:not_member, page} ->
{"p NOT IN {$#{where_param_idx}:Array(String)}", page}
{:member, page} ->
{"p IN tuple(?)", page}
{:not_member, page} ->
{"p NOT IN tuple(?)", page}
{:matches, expr} ->
regex = page_regex(expr)
{"match(p, {$#{where_param_idx}:String})", regex}
@ -95,14 +89,6 @@ defmodule Plausible.Stats.Aggregate do
page_regexes = Enum.map(exprs, &page_regex/1)
{"not(multiMatchAny(p, {$#{where_param_idx}:Array(String)}))", page_regexes}
{:matches_member, exprs} ->
page_regexes = Enum.map(exprs, &page_regex/1)
{"multiMatchAny(p, array(?))", page_regexes}
{:not_matches_member, exprs} ->
page_regexes = Enum.map(exprs, &page_regex/1)
{"not(multiMatchAny(p, array(?)))", page_regexes}
{:does_not_match, expr} ->
regex = page_regex(expr)
{"not(match(p, {$#{where_param_idx}:String}))", regex}

@ -222,10 +222,6 @@ defmodule Plausible.Stats.Base do
list = Enum.map(values, &db_prop_val(prop_name, &1))
from(s in sessions_q, where: fragment("? not in ?", field(s, ^prop_name), ^list))
{:not_member, values} ->
list = Enum.map(values, &db_prop_val(prop_name, &1))
from(s in sessions_q, where: fragment("? not in tuple(?)", field(s, ^prop_name), ^list))
{:matches, expr} ->
regex = page_regex(expr)
from(s in sessions_q, where: fragment("match(?, ?)", field(s, ^prop_name), ^regex))

Loading…
Cancel
Save