WIP

Author: zoldar

lib/plausible/stats/sql/expression.ex

@@ -208,6 +208,21 @@ defmodule Plausible.Stats.SQL.Expression do
     end
   end
 
+  def select_dimension_from_join(q, key, "event:name"),
+    do: select_merge_as(q, [..., t], %{key => t.name})
+
+  def select_dimension_from_join(q, key, "event:page"),
+    do: select_merge_as(q, [..., t], %{key => t.pathname})
+
+  def select_dimension_from_join(q, key, "event:hostname"),
+    do: select_merge_as(q, [..., t], %{key => t.hostname})
+
+  def select_dimension_from_join(q, key, "visit:entry_page"),
+    do: select_merge_as(q, [..., t], %{key => t.entry_page})
+
+  def select_dimension_from_join(q, key, "visit:exit_page"),
+    do: select_merge_as(q, [..., t], %{key => t.exit_page})
+
   def event_metric(:pageviews, _query) do
     wrap_alias([e], %{
       pageviews: scale_sample(fragment("countIf(? = 'pageview')", e.name))

lib/plausible/stats/sql/query_builder.ex

@@ -19,9 +19,11 @@ defmodule Plausible.Stats.SQL.QueryBuilder do
     |> QueryOptimizer.split()
     |> Enum.map(fn {table_type, table_query} ->
       q = build_table_query(table_type, site, table_query)
+      {table_type, q} |> IO.inspect(label: :QUERY)
       {table_type, table_query, q}
     end)
     |> join_query_results(query)
+    |> IO.inspect(label: :JOINED_QUERY)
     |> build_order_by(query)
     |> paginate(query.pagination)
     |> select_total_rows(query.include.total_rows)
@@ -148,12 +150,20 @@ defmodule Plausible.Stats.SQL.QueryBuilder do
     Enum.reduce(
       session_only_dimensions,
       q,
-      &dimension_group_by(&2, :events, :sessions, query, &1)
+      &dimension_group_by_join(&2, query, &1)
     )
   end
 
   def build_group_by(q, :sessions, query) do
-    Enum.reduce(query.dimensions, q, &dimension_group_by(&2, table, query, &1))
+    Enum.reduce(query.dimensions, q, &dimension_group_by(&2, :sessions, query, &1))
+  end
+
+  defp dimension_group_by_join(q, query, dimension) do
+    key = shortname(query, dimension)
+
+    q
+    |> Expression.select_dimension_from_join(key, dimension)
+    |> group_by([], selected_as(^key))
   end
 
   defp dimension_group_by(q, :events, query, "event:goal" = dimension) do
@@ -178,9 +188,6 @@ defmodule Plausible.Stats.SQL.QueryBuilder do
     |> group_by([], selected_as(^key))
   end
 
-  defp dimension_group_by(q, base_table, join_table, query, dimension) do
-  end
-
   defp build_order_by(q, query, {metric_or_dimension, order_direction}) do
     order_by(
       q,