Open source, privacy-first web analytics. Lightweight, cookie-free Google Analytics alternative. Self-hosted or cloud.
TypeScript analyticsanalytics-dashboardclickhouseelixirgoogle-analyticsmarketingopen-source-analyticsphoenixplausible-analyticspostgresqlprivacyprivacy-friendlyself-hostedsimple-analyticsstatisticstailwindcssweb-analyticswebsite-analyticswebsite-statswebsite-tracking
Follow-up to Solve noisy warnings about a negative range was inferred for Date.range/2 (#4816)
Karl-Aksel Puulmann07a3436fa298
diff --git a/lib/plausible/stats/query.ex b/lib/plausible/stats/query.exindex f5bd669a48..c4e18a01ec 100644--- a/lib/plausible/stats/query.ex+++ b/lib/plausible/stats/query.ex@@ -57,15 +57,19 @@ defmodule Plausible.Stats.Query doDate.range(date_range.first,- earliest(date_range.last, today)+ clamp(today, date_range))elsedate_rangeendend- defp earliest(a, b) do- if Date.compare(a, b) in [:eq, :lt], do: a, else: b+ defp clamp(date, date_range) do+ cond do+ date in date_range -> date+ Date.before?(date, date_range.first) -> date_range.first+ Date.after?(date, date_range.last) -> date_range.last+ endenddef set(query, keywords) dodiff --git a/test/plausible/stats/query_test.exs b/test/plausible/stats/query_test.exsindex fae5524c35..ce5af98cd8 100644--- a/test/plausible/stats/query_test.exs+++ b/test/plausible/stats/query_test.exs@@ -266,6 +266,13 @@ defmodule Plausible.Stats.QueryTest do~U[2024-05-07 07:00:00Z],trim_trailing: true) == Date.range(~D[2024-05-05], ~D[2024-05-06])++ assert date_range(+ {~U[2024-05-05 12:00:00Z], ~U[2024-05-08 11:59:59Z]},+ "Etc/GMT+12",+ ~U[2024-05-03 07:00:00Z],+ trim_trailing: true+ ) == Date.range(~D[2024-05-05], ~D[2024-05-05])endend