select_merge_as more

plausible · Jun 28, 2024 · 97207e4 · 97207e4
1 parent 31a5b34
commit 97207e4
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 14 deletions.
diff --git a/lib/plausible/stats/base.ex b/lib/plausible/stats/base.ex
@@ -178,7 +178,7 @@ defmodule Plausible.Stats.Base do
       total_query = Query.set_dimensions(query, [])
 
       q
-      |> select_merge(^total_visitors_subquery(site, total_query, query.include_imported))
+      |> select_merge_as([], total_visitors_subquery(site, total_query, query.include_imported))
       |> select_merge_as([], %{
         percentage:
           fragment(
@@ -205,7 +205,7 @@ defmodule Plausible.Stats.Base do
 
       # :TRICKY: Subquery is used due to event:goal breakdown above doing an UNION ALL
       subquery(q)
-      |> select_merge(^total_visitors_subquery(site, total_query, query.include_imported))
+      |> select_merge_as([], total_visitors_subquery(site, total_query, query.include_imported))
       |> select_merge_as([e], %{
         conversion_rate:
           fragment(

diff --git a/lib/plausible/stats/sql/fragments.ex b/lib/plausible/stats/sql/fragments.ex
@@ -166,6 +166,8 @@ defmodule Plausible.Stats.SQL.Fragments do
     }
   end
 
+  defp update_literal_map_values(ast, _), do: ast
+
   @doc """
   Convenience Ecto macro for wrapping a map passed to select_merge_as such that each
   expression gets wrapped in dynamic and set as selected_as.

diff --git a/lib/plausible/stats/sql/query_builder.ex b/lib/plausible/stats/sql/query_builder.ex
@@ -124,19 +124,19 @@ defmodule Plausible.Stats.SQL.QueryBuilder do
 
     from(e in q,
       array_join: goal in Expression.event_goal_join(events, page_regexes),
-      select_merge: %{
-        ^shortname(query, dimension) => fragment("?", goal)
-      },
       group_by: goal,
       where: goal != 0 and (e.name == "pageview" or goal < 0)
     )
+    |> select_merge_as([e, goal], %{
+      shortname(query, dimension) => fragment("?", goal)
+    })
   end
 
   defp dimension_group_by(q, query, dimension) do
     key = shortname(query, dimension)
 
     q
-    |> select_merge(^Expression.dimension(key, dimension, query))
+    |> select_merge_as([], Expression.dimension(key, dimension, query))
     |> group_by([], selected_as(^key))
   end
 
@@ -160,13 +160,9 @@ defmodule Plausible.Stats.SQL.QueryBuilder do
       Enum.reduce(unquote(list), unquote(q), fn metric_or_dimension, q ->
         key = shortname(unquote(query), metric_or_dimension)
 
-        select_merge_as(
-          q,
-          [e, s],
-          %{
-            key => field(unquote(table_name), ^key)
-          }
-        )
+        select_merge_as(q, [e, s], %{
+          key => field(unquote(table_name), ^key)
+        })
       end)
     end
   end
@@ -182,7 +178,10 @@ defmodule Plausible.Stats.SQL.QueryBuilder do
         |> Query.set_dimensions([])
 
       q
-      |> select_merge(^Base.total_visitors_subquery(site, total_query, query.include_imported))
+      |> select_merge_as(
+        [],
+        Base.total_visitors_subquery(site, total_query, query.include_imported)
+      )
       |> select_merge_as([e], %{
         conversion_rate:
           fragment(