From 6642a4c14eb6d9fcd8d41cd8adfeaeea1ebe0f01 Mon Sep 17 00:00:00 2001 From: Uku Taht Date: Wed, 22 Mar 2023 11:29:06 +0200 Subject: [PATCH] Clean up some rebase mistakes --- lib/plausible/stats/aggregate.ex | 14 -------------- lib/plausible/stats/base.ex | 4 ---- 2 files changed, 18 deletions(-) diff --git a/lib/plausible/stats/aggregate.ex b/lib/plausible/stats/aggregate.ex index 9e43749a1..e7d79081c 100644 --- a/lib/plausible/stats/aggregate.ex +++ b/lib/plausible/stats/aggregate.ex @@ -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} diff --git a/lib/plausible/stats/base.ex b/lib/plausible/stats/base.ex index 900d14f91..225fc3029 100644 --- a/lib/plausible/stats/base.ex +++ b/lib/plausible/stats/base.ex @@ -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))