From 0ee58cf4557313ad4f3151d67042111064f22cb4 Mon Sep 17 00:00:00 2001 From: Neil Kakkar Date: Fri, 23 Jul 2021 13:16:48 +0100 Subject: [PATCH 1/2] ensure bins stay uniform --- ee/clickhouse/queries/funnels/funnel_time_to_convert.py | 2 +- ee/clickhouse/util.py | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/ee/clickhouse/queries/funnels/funnel_time_to_convert.py b/ee/clickhouse/queries/funnels/funnel_time_to_convert.py index 3d2ebae5a7595..4e2a03110b4c6 100644 --- a/ee/clickhouse/queries/funnels/funnel_time_to_convert.py +++ b/ee/clickhouse/queries/funnels/funnel_time_to_convert.py @@ -109,7 +109,7 @@ def get_query(self) -> str: FROM step_runs GROUP BY bin_from_seconds ) results - FULL OUTER JOIN ( + RIGHT OUTER JOIN ( /* Making sure bin_count bins are returned */ /* Those not present in the results query due to lack of data simply get person_count 0 */ SELECT histogram_from_seconds + number * bin_width_seconds AS bin_from_seconds FROM system.numbers LIMIT {bin_count_identifier} + 1 diff --git a/ee/clickhouse/util.py b/ee/clickhouse/util.py index fe7cfbd847498..b0786067c48e6 100644 --- a/ee/clickhouse/util.py +++ b/ee/clickhouse/util.py @@ -23,6 +23,7 @@ class ClickhouseTestMixin: def tearDown(self): try: + # pass self._destroy_event_tables() self._destroy_person_tables() self._destroy_session_recording_tables() From 968339ee7bd79d60868e1391dd3d30e4f28ba427 Mon Sep 17 00:00:00 2001 From: Neil Kakkar Date: Fri, 23 Jul 2021 13:20:21 +0100 Subject: [PATCH 2/2] rm offending line --- ee/clickhouse/util.py | 1 - 1 file changed, 1 deletion(-) diff --git a/ee/clickhouse/util.py b/ee/clickhouse/util.py index b0786067c48e6..fe7cfbd847498 100644 --- a/ee/clickhouse/util.py +++ b/ee/clickhouse/util.py @@ -23,7 +23,6 @@ class ClickhouseTestMixin: def tearDown(self): try: - # pass self._destroy_event_tables() self._destroy_person_tables() self._destroy_session_recording_tables()