From 997708a74f89d9e44dc91691f6bc8f91ac67abc2 Mon Sep 17 00:00:00 2001
From: Rebecca BurWei <rebecca.burwei@gmail.com>
Date: Fri, 3 Jun 2022 14:26:59 -0500
Subject: [PATCH] Add country to urlbar_clients_daily (#3009)

* Add country to urlbar_clients_daily
---
 .../telemetry_derived/urlbar_clients_daily_v1/query.sql      | 2 ++
 .../telemetry_derived/urlbar_clients_daily_v1/schema.yaml    | 3 +++
 .../test_overactive_filter/expect.yaml                       | 1 +
 .../telemetry.clients_daily.schema.json                      | 5 +++++
 .../test_overactive_filter/telemetry.clients_daily.yaml      | 1 +
 5 files changed, 12 insertions(+)

diff --git a/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/query.sql b/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/query.sql
index c0781e2aab..08f9644b82 100644
--- a/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/query.sql
+++ b/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/query.sql
@@ -39,6 +39,7 @@ WITH combined_urlbar_picked AS (
     experiments,
     app_version,
     normalized_channel,
+    country,
     locale,
     user_pref_browser_search_region AS search_region,
     SAFE_CAST(user_pref_browser_search_suggest_enabled AS BOOL) AS suggest_enabled,
@@ -157,6 +158,7 @@ SELECT
   experiments,
   app_version,
   normalized_channel,
+  country,
   locale,
   search_region,
   suggest_enabled,
diff --git a/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/schema.yaml b/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/schema.yaml
index 018b2f20f3..126071888b 100644
--- a/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/schema.yaml
+++ b/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/schema.yaml
@@ -14,6 +14,9 @@ fields:
 - mode: NULLABLE
   name: normalized_channel
   type: STRING
+- mode: NULLABLE
+  name: country
+  type: STRING
 - mode: NULLABLE
   name: locale
   type: STRING
diff --git a/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/expect.yaml b/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/expect.yaml
index 7928c0af3a..cf9c5011f7 100644
--- a/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/expect.yaml
+++ b/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/expect.yaml
@@ -7,6 +7,7 @@
   normalized_channel: "nightly"
   locale: "en-US"
   search_region: "US"
+  country: "US"
   suggest_enabled: true
   in_navbar: true
   suggest_searches: true
diff --git a/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/telemetry.clients_daily.schema.json b/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/telemetry.clients_daily.schema.json
index f249377898..86e6651ead 100644
--- a/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/telemetry.clients_daily.schema.json
+++ b/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/telemetry.clients_daily.schema.json
@@ -28,6 +28,11 @@
     "mode": "NULLABLE",
     "name": "locale",
     "type": "STRING"
+  },
+    {
+    "mode": "NULLABLE",
+    "name": "country",
+    "type": "STRING"
   },
   {
     "mode": "NULLABLE",
diff --git a/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/telemetry.clients_daily.yaml b/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/telemetry.clients_daily.yaml
index 6b77cd9671..31de704148 100644
--- a/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/telemetry.clients_daily.yaml
+++ b/tests/sql/moz-fx-data-shared-prod/telemetry_derived/urlbar_clients_daily_v1/test_overactive_filter/telemetry.clients_daily.yaml
@@ -6,6 +6,7 @@
   app_version: "one"
   normalized_channel: "nightly"
   locale: "en-US"
+  country: "US"
   user_pref_browser_search_region: "US"
   user_pref_browser_search_suggest_enabled: true
   user_pref_browser_widget_in_navbar: true