Include nightly channel in fenix clients_daily

Closes #1077
mozilla · Jan 21, 2020 · 1b77ee8 · 1b77ee8
1 parent c092f74
commit 1b77ee8
Show file tree

Hide file tree

Showing 2 changed files with 52 additions and 4 deletions.
diff --git a/sql/org_mozilla_fenix_derived/clients_daily_v1/query.sql b/sql/org_mozilla_fenix_derived/clients_daily_v1/query.sql
@@ -71,7 +71,7 @@ WITH unioned AS (
     client_info,
     sample_id,
     metadata,
-    normalized_channel,
+    'release' AS normalized_channel,
     metrics AS baseline_metrics,
     NULL AS metrics
   FROM
@@ -83,11 +83,35 @@ WITH unioned AS (
     client_info,
     sample_id,
     metadata,
-    normalized_channel,
+    'release' AS normalized_channel,
     NULL AS baseline_metrics,
     metrics
   FROM
     org_mozilla_fenix_stable.metrics_v1
+  UNION ALL
+  SELECT
+    submission_timestamp,
+    document_id,
+    client_info,
+    sample_id,
+    metadata,
+    'nightly' AS normalized_channel,
+    metrics AS baseline_metrics,
+    NULL AS metrics
+  FROM
+    org_mozilla_fenix_nightly_stable.baseline_v1
+  UNION ALL
+  SELECT
+    submission_timestamp,
+    document_id,
+    client_info,
+    sample_id,
+    metadata,
+    'nightly' AS normalized_channel,
+    NULL AS baseline_metrics,
+    metrics
+  FROM
+    org_mozilla_fenix_nightly_stable.metrics_v1
 ),
   --
 base AS (

diff --git a/templates/org_mozilla_fenix_derived/clients_daily_v1/query.sql b/templates/org_mozilla_fenix_derived/clients_daily_v1/query.sql
@@ -5,7 +5,7 @@ WITH unioned AS (
     client_info,
     sample_id,
     metadata,
-    normalized_channel,
+    'release' AS normalized_channel,
     metrics AS baseline_metrics,
     NULL AS metrics
   FROM
@@ -17,11 +17,35 @@ WITH unioned AS (
     client_info,
     sample_id,
     metadata,
-    normalized_channel,
+    'release' AS normalized_channel,
     NULL AS baseline_metrics,
     metrics
   FROM
     org_mozilla_fenix_stable.metrics_v1
+  UNION ALL
+  SELECT
+    submission_timestamp,
+    document_id,
+    client_info,
+    sample_id,
+    metadata,
+    'nightly' AS normalized_channel,
+    metrics AS baseline_metrics,
+    NULL AS metrics
+  FROM
+    org_mozilla_fenix_nightly_stable.baseline_v1
+  UNION ALL
+  SELECT
+    submission_timestamp,
+    document_id,
+    client_info,
+    sample_id,
+    metadata,
+    'nightly' AS normalized_channel,
+    NULL AS baseline_metrics,
+    metrics
+  FROM
+    org_mozilla_fenix_nightly_stable.metrics_v1
 ),
   --
 base AS (