DO-2075 Removed init in clients city seen

[wwyc]

Description

Initializing baseline_city_seen tables by @sample_id in #7974 was triggering:
Quota exceeded: Your table exceeded quota for Number of partition modifications to a column-partitioned table.

This PR changes the initialization strategy to:

1. Remove init statements from query template
2. Perform a managed backfill with custom query to initialize the table

Related Tickets & Documents

• DO-2075

Reviewer, please follow this checklist

[dataops-ci-bot]

Integration report for "Removed time columns"

sql.diff

Click to expand!

diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/baseline_clients_daily_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/baseline_clients_daily_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/baseline_clients_daily_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/baseline_clients_daily_v1/metadata.yaml	2025-10-14 17:34:27.000000000 +0000
@@ -39,7 +39,7 @@
   enabled: false
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/baseline_clients_first_seen_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/baseline_clients_first_seen_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/baseline_clients_first_seen_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/baseline_clients_first_seen_v1/metadata.yaml	2025-10-14 17:34:27.000000000 +0000
@@ -49,7 +49,7 @@
   enabled: false
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/baseline_clients_last_seen_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/baseline_clients_last_seen_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/baseline_clients_last_seen_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/baseline_clients_last_seen_v1/metadata.yaml	2025-10-14 17:34:27.000000000 +0000
@@ -48,7 +48,7 @@
   enabled: false
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/metrics_clients_daily_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/metrics_clients_daily_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/metrics_clients_daily_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/accounts_cirrus_derived/metrics_clients_daily_v1/metadata.yaml	2025-10-14 17:34:27.000000000 +0000
@@ -34,7 +34,7 @@
   enabled: false
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/baseline_clients_daily_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/baseline_clients_daily_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/baseline_clients_daily_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/baseline_clients_daily_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -39,7 +39,7 @@
   enabled: false
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/baseline_clients_first_seen_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/baseline_clients_first_seen_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/baseline_clients_first_seen_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/baseline_clients_first_seen_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -49,7 +49,7 @@
   enabled: false
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/baseline_clients_last_seen_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/baseline_clients_last_seen_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/baseline_clients_last_seen_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/baseline_clients_last_seen_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -48,7 +48,7 @@
   enabled: false
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/metrics_clients_daily_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/metrics_clients_daily_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/metrics_clients_daily_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/metrics_clients_daily_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -34,7 +34,7 @@
   enabled: false
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/metrics_clients_last_seen_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/metrics_clients_last_seen_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/metrics_clients_last_seen_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/burnham_derived/metrics_clients_last_seen_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -48,7 +48,7 @@
   enabled: false
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates/schema.yaml	2025-10-14 17:18:31.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates/schema.yaml	2025-10-14 17:25:03.000000000 +0000
@@ -1,49 +1,49 @@
 fields:
-- mode: NULLABLE
-  name: submission_date
+- name: submission_date
   type: DATE
-- mode: NULLABLE
-  name: source
+  mode: NULLABLE
+- name: source
   type: STRING
-- mode: NULLABLE
-  name: event_type
+  mode: NULLABLE
+- name: event_type
   type: STRING
-- mode: NULLABLE
-  name: form_factor
+  mode: NULLABLE
+- name: form_factor
   type: STRING
-- mode: NULLABLE
-  name: country
+  mode: NULLABLE
+- name: country
   type: STRING
-- mode: NULLABLE
-  name: subdivision1
+  mode: NULLABLE
+- name: subdivision1
   type: STRING
-- mode: NULLABLE
-  name: advertiser
+  mode: NULLABLE
+- name: advertiser
   type: STRING
-- mode: NULLABLE
-  name: release_channel
+  mode: NULLABLE
+- name: release_channel
   type: STRING
-- mode: NULLABLE
-  name: position
+  mode: NULLABLE
+- name: position
   type: INTEGER
-- mode: NULLABLE
-  name: provider
+  mode: NULLABLE
+- name: provider
   type: STRING
-- mode: NULLABLE
-  name: match_type
+  mode: NULLABLE
+- name: match_type
   type: STRING
-- mode: NULLABLE
-  name: normalized_os
+  mode: NULLABLE
+- name: normalized_os
   type: STRING
-- mode: NULLABLE
-  name: suggest_data_sharing_enabled
+  mode: NULLABLE
+- name: suggest_data_sharing_enabled
   type: BOOLEAN
-- mode: NULLABLE
-  name: event_count
+  mode: NULLABLE
+- name: event_count
   type: INTEGER
-- mode: NULLABLE
-  name: user_count
+  mode: NULLABLE
+- name: user_count
   type: INTEGER
-- mode: NULLABLE
-  name: query_type
+  mode: NULLABLE
+- name: query_type
   type: STRING
+  mode: NULLABLE
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates_suggest/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates_suggest/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates_suggest/schema.yaml	2025-10-14 17:18:31.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/contextual_services/event_aggregates_suggest/schema.yaml	2025-10-14 17:25:10.000000000 +0000
@@ -1,40 +1,40 @@
 fields:
-- mode: NULLABLE
-  name: submission_date
+- name: submission_date
   type: DATE
-- mode: NULLABLE
-  name: form_factor
+  mode: NULLABLE
+- name: form_factor
   type: STRING
-- mode: NULLABLE
-  name: country
+  mode: NULLABLE
+- name: country
   type: STRING
-- mode: NULLABLE
-  name: advertiser
+  mode: NULLABLE
+- name: advertiser
   type: STRING
-- mode: NULLABLE
-  name: normalized_os
+  mode: NULLABLE
+- name: normalized_os
   type: STRING
-- mode: NULLABLE
-  name: release_channel
+  mode: NULLABLE
+- name: release_channel
   type: STRING
-- mode: NULLABLE
-  name: position
+  mode: NULLABLE
+- name: position
   type: INTEGER
-- mode: NULLABLE
-  name: provider
+  mode: NULLABLE
+- name: provider
   type: STRING
-- mode: NULLABLE
-  name: match_type
+  mode: NULLABLE
+- name: match_type
   type: STRING
-- mode: NULLABLE
-  name: suggest_data_sharing_enabled
+  mode: NULLABLE
+- name: suggest_data_sharing_enabled
   type: BOOLEAN
-- mode: NULLABLE
-  name: impression_count
+  mode: NULLABLE
+- name: impression_count
   type: INTEGER
-- mode: NULLABLE
-  name: click_count
+  mode: NULLABLE
+- name: click_count
   type: INTEGER
-- mode: NULLABLE
-  name: query_type
+  mode: NULLABLE
+- name: query_type
   type: STRING
+  mode: NULLABLE
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/baseline_clients_daily_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/baseline_clients_daily_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/baseline_clients_daily_v1/metadata.yaml	2025-10-14 17:18:31.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/baseline_clients_daily_v1/metadata.yaml	2025-10-14 17:34:27.000000000 +0000
@@ -39,7 +39,7 @@
   enabled: true
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/baseline_clients_first_seen_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/baseline_clients_first_seen_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/baseline_clients_first_seen_v1/metadata.yaml	2025-10-14 17:18:31.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/baseline_clients_first_seen_v1/metadata.yaml	2025-10-14 17:34:27.000000000 +0000
@@ -49,7 +49,7 @@
   enabled: true
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/baseline_clients_last_seen_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/baseline_clients_last_seen_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/baseline_clients_last_seen_v1/metadata.yaml	2025-10-14 17:18:31.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/baseline_clients_last_seen_v1/metadata.yaml	2025-10-14 17:34:27.000000000 +0000
@@ -51,7 +51,7 @@
   enabled: true
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/metrics_clients_daily_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/metrics_clients_daily_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/metrics_clients_daily_v1/metadata.yaml	2025-10-14 17:18:31.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/experimenter_cirrus_derived/metrics_clients_daily_v1/metadata.yaml	2025-10-14 17:34:27.000000000 +0000
@@ -34,7 +34,7 @@
   enabled: true
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/broken_site_report/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/broken_site_report/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/broken_site_report/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/broken_site_report/metadata.yaml	2025-10-14 17:34:26.000000000 +0000
@@ -1,6 +1,10 @@
-friendly_name: Broken Site Report
+friendly_name: App-specific view for Glean ping "broken-site-report"
 description: |-
-  Please provide a description for the query
+  This a view that UNIONs the stable ping tables
+  across all channels of the Glean application "Firefox for Android"
+  (org_mozilla_firefox.broken_site_report, org_mozilla_firefox_beta.broken_site_report, org_mozilla_fenix.broken_site_report, org_mozilla_fenix_nightly.broken_site_report, org_mozilla_fennec_aurora.broken_site_report).
+
+  It is used by Looker.
 owners: []
 labels: {}
 bigquery: null
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/crash/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/crash/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/crash/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/crash/metadata.yaml	2025-10-14 17:34:26.000000000 +0000
@@ -1,6 +1,10 @@
-friendly_name: Crash
+friendly_name: App-specific view for Glean ping "crash"
 description: |-
-  Please provide a description for the query
+  This a view that UNIONs the stable ping tables
+  across all channels of the Glean application "Firefox for Android"
+  (org_mozilla_firefox.crash, org_mozilla_firefox_beta.crash, org_mozilla_fenix.crash, org_mozilla_fenix_nightly.crash, org_mozilla_fennec_aurora.crash).
+
+  It is used by Looker.
 owners: []
 labels: {}
 bigquery: null
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/funnel_retention_clients/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/funnel_retention_clients/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/funnel_retention_clients/schema.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/funnel_retention_clients/schema.yaml	2025-10-14 17:25:09.000000000 +0000
@@ -26,6 +26,9 @@
 - name: adjust_network
   type: STRING
   mode: NULLABLE
+- name: install_source
+  type: STRING
+  mode: NULLABLE
 - name: retained_week_2
   type: BOOLEAN
   mode: NULLABLE
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/funnel_retention_week_4/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/funnel_retention_week_4/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix/funnel_retention_week_4/schema.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix/funnel_retention_week_4/schema.yaml	2025-10-14 17:25:18.000000000 +0000
@@ -48,6 +48,9 @@
   description: 'The type of source of a client installation.
 
     '
+- name: install_source
+  type: STRING
+  mode: NULLABLE
 - name: new_profiles
   type: INTEGER
   mode: NULLABLE
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/attribution_clients_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/attribution_clients_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/attribution_clients_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/attribution_clients_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -41,7 +41,7 @@
   enabled: true
   collection: Operational Checks
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/baseline_clients_city_seen_v1/query.sql /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/baseline_clients_city_seen_v1/query.sql
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/baseline_clients_city_seen_v1/query.sql	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/baseline_clients_city_seen_v1/query.sql	2025-10-14 17:24:00.000000000 +0000
@@ -7,26 +7,14 @@
     DATE(submission_timestamp) AS submission_date,
     LOWER(client_info.client_id) AS client_id,
     sample_id,
-    mozfun.glean.parse_datetime(ping_info.end_time) AS parsed_end_time,
-    `moz-fx-data-shared-prod.udf.glean_timespan_seconds`(
-      metrics.timespan.glean_baseline_duration
-    ) AS duration,
     metadata.geo.city AS city,
     metadata.geo.subdivision1 AS subdivision1,
     metadata.geo.subdivision2 AS subdivision2,
     metadata.geo.country AS country
   FROM
-    {% if is_init() %}
-      `moz-fx-data-shared-prod.org_mozilla_firefox_stable.baseline_v1`
-    {% else %}
       `moz-fx-data-shared-prod.org_mozilla_firefox_live.baseline_v1`
-    {% endif %}
   WHERE
     client_info.client_id IS NOT NULL
-    {% if is_init() %}
-      AND sample_id = @sample_id
-      AND DATE(submission_timestamp) <= CURRENT_DATE()
-    {% else %}
       AND DATE(submission_timestamp) = @submission_date
       AND 'automation' NOT IN (
         SELECT
@@ -36,7 +24,6 @@
       )
       QUALIFY
         ROW_NUMBER() OVER (PARTITION BY document_id ORDER BY submission_timestamp) = 1
-    {% endif %}
 ),
 overactive_org_mozilla_firefox AS (
   -- Find client_ids with over 150 000 pings in a day,
@@ -47,11 +34,7 @@
   FROM
     base_org_mozilla_firefox
   WHERE
-    {% if is_init() %}
-      submission_date >= '2018-01-01'
-    {% else %}
       submission_date = @submission_date
-    {% endif %}
   GROUP BY
     submission_date,
     client_id
@@ -77,61 +60,21 @@
     -- `mode_last` can result in struct with all null values if it’s most frequent (or latest among ties).
     -- This exclude structs with all null values so there will always be one non-NULL field.
     AND COALESCE(city, subdivision1, subdivision2, country) IS NOT NULL
-    {% if is_init() %}
-      AND submission_date >= '2018-01-01'
-    {% else %}
       AND submission_date = @submission_date
-    {% endif %}
   GROUP BY
     submission_date,
     client_id,
     sample_id
 ),
-{% if is_init() %}
-  clients_city_first_seen_org_mozilla_firefox AS (
-    SELECT
-      app_id,
-      client_id,
-      sample_id,
-      submission_date AS first_seen_city_date,
-      geo.city AS first_seen_city,
-      geo.subdivision1 AS first_seen_subdivision1,
-      geo.subdivision2 AS first_seen_subdivision2,
-      geo.country AS first_seen_country
-    FROM
-      clients_daily_org_mozilla_firefox
-    WHERE
-      geo.city IS NOT NULL
-    QUALIFY
-      ROW_NUMBER() OVER (PARTITION BY client_id, sample_id ORDER BY submission_date) = 1
-  ),
-  clients_city_last_seen_org_mozilla_firefox AS (
-    SELECT
-      app_id,
-      client_id,
-      sample_id,
-      submission_date AS last_seen_city_date,
-      geo.city AS last_seen_city,
-      geo.subdivision1 AS last_seen_subdivision1,
-      geo.subdivision2 AS last_seen_subdivision2,
-      geo.country AS last_seen_country
-    FROM
-      clients_daily_org_mozilla_firefox
-    WHERE
-      geo.city IS NOT NULL
-    QUALIFY
-      ROW_NUMBER() OVER (PARTITION BY client_id, sample_id ORDER BY submission_date DESC) = 1
-  ),
-{% else %}
-  _previous_org_mozilla_firefox AS (
+_previous_org_mozilla_firefox AS (
     SELECT
       *
     FROM
       `moz-fx-data-shared-prod.fenix_derived.baseline_clients_city_seen_v1`
     WHERE
       app_id = "org_mozilla_firefox"
-  ),
-  _current_org_mozilla_firefox AS (
+),
+_current_org_mozilla_firefox AS (
     SELECT
       app_id,
       client_id,
@@ -150,8 +93,7 @@
       clients_daily_org_mozilla_firefox
     WHERE
       geo.city IS NOT NULL
-  ),
-{% endif %}
+),
 base_org_mozilla_firefox_beta AS (
   -- Live table dedup logic mimics copy_deduplicate
   SELECT
@@ -159,26 +101,14 @@
     DATE(submission_timestamp) AS submission_date,
     LOWER(client_info.client_id) AS client_id,
     sample_id,
-    mozfun.glean.parse_datetime(ping_info.end_time) AS parsed_end_time,
-    `moz-fx-data-shared-prod.udf.glean_timespan_seconds`(
-      metrics.timespan.glean_baseline_duration
-    ) AS duration,
     metadata.geo.city AS city,
     metadata.geo.subdivision1 AS subdivision1,
     metadata.geo.subdivision2 AS subdivision2,
     metadata.geo.country AS country
   FROM
-    {% if is_init() %}
-      `moz-fx-data-shared-prod.org_mozilla_firefox_beta_stable.baseline_v1`
-    {% else %}
       `moz-fx-data-shared-prod.org_mozilla_firefox_beta_live.baseline_v1`
-    {% endif %}
   WHERE
     client_info.client_id IS NOT NULL
-    {% if is_init() %}
-      AND sample_id = @sample_id
-      AND DATE(submission_timestamp) <= CURRENT_DATE()
-    {% else %}
       AND DATE(submission_timestamp) = @submission_date
       AND 'automation' NOT IN (
         SELECT
@@ -188,7 +118,6 @@
       )
       QUALIFY
         ROW_NUMBER() OVER (PARTITION BY document_id ORDER BY submission_timestamp) = 1
-    {% endif %}
 ),
 overactive_org_mozilla_firefox_beta AS (
   -- Find client_ids with over 150 000 pings in a day,
@@ -199,11 +128,7 @@
   FROM
     base_org_mozilla_firefox_beta
   WHERE
-    {% if is_init() %}
-      submission_date >= '2018-01-01'
-    {% else %}
       submission_date = @submission_date
-    {% endif %}
   GROUP BY
     submission_date,
     client_id
@@ -229,61 +154,21 @@
     -- `mode_last` can result in struct with all null values if it’s most frequent (or latest among ties).
     -- This exclude structs with all null values so there will always be one non-NULL field.
     AND COALESCE(city, subdivision1, subdivision2, country) IS NOT NULL
-    {% if is_init() %}
-      AND submission_date >= '2018-01-01'
-    {% else %}
       AND submission_date = @submission_date
-    {% endif %}
   GROUP BY
     submission_date,
     client_id,
     sample_id
 ),
-{% if is_init() %}
-  clients_city_first_seen_org_mozilla_firefox_beta AS (
-    SELECT
-      app_id,
-      client_id,
-      sample_id,
-      submission_date AS first_seen_city_date,
-      geo.city AS first_seen_city,
-      geo.subdivision1 AS first_seen_subdivision1,
-      geo.subdivision2 AS first_seen_subdivision2,
-      geo.country AS first_seen_country
-    FROM
-      clients_daily_org_mozilla_firefox_beta
-    WHERE
-      geo.city IS NOT NULL
-    QUALIFY
-      ROW_NUMBER() OVER (PARTITION BY client_id, sample_id ORDER BY submission_date) = 1
-  ),
-  clients_city_last_seen_org_mozilla_firefox_beta AS (
-    SELECT
-      app_id,
-      client_id,
-      sample_id,
-      submission_date AS last_seen_city_date,
-      geo.city AS last_seen_city,
-      geo.subdivision1 AS last_seen_subdivision1,
-      geo.subdivision2 AS last_seen_subdivision2,
-      geo.country AS last_seen_country
-    FROM
-      clients_daily_org_mozilla_firefox_beta
-    WHERE
-      geo.city IS NOT NULL
-    QUALIFY
-      ROW_NUMBER() OVER (PARTITION BY client_id, sample_id ORDER BY submission_date DESC) = 1
-  ),
-{% else %}
-  _previous_org_mozilla_firefox_beta AS (
+_previous_org_mozilla_firefox_beta AS (
     SELECT
       *
     FROM
       `moz-fx-data-shared-prod.fenix_derived.baseline_clients_city_seen_v1`
     WHERE
       app_id = "org_mozilla_firefox_beta"
-  ),
-  _current_org_mozilla_firefox_beta AS (
+),
+_current_org_mozilla_firefox_beta AS (
     SELECT
       app_id,
       client_id,
@@ -302,8 +187,7 @@
       clients_daily_org_mozilla_firefox_beta
     WHERE
       geo.city IS NOT NULL
-  ),
-{% endif %}
+),
 base_org_mozilla_fenix AS (
   -- Live table dedup logic mimics copy_deduplicate
   SELECT
@@ -311,26 +195,14 @@
     DATE(submission_timestamp) AS submission_date,
     LOWER(client_info.client_id) AS client_id,
     sample_id,
-    mozfun.glean.parse_datetime(ping_info.end_time) AS parsed_end_time,
-    `moz-fx-data-shared-prod.udf.glean_timespan_seconds`(
-      metrics.timespan.glean_baseline_duration
-    ) AS duration,
     metadata.geo.city AS city,
     metadata.geo.subdivision1 AS subdivision1,
     metadata.geo.subdivision2 AS subdivision2,
     metadata.geo.country AS country
   FROM
-    {% if is_init() %}
-      `moz-fx-data-shared-prod.org_mozilla_fenix_stable.baseline_v1`
-    {% else %}
       `moz-fx-data-shared-prod.org_mozilla_fenix_live.baseline_v1`
-    {% endif %}
   WHERE
     client_info.client_id IS NOT NULL
-    {% if is_init() %}
-      AND sample_id = @sample_id
-      AND DATE(submission_timestamp) <= CURRENT_DATE()
-    {% else %}
       AND DATE(submission_timestamp) = @submission_date
       AND 'automation' NOT IN (
         SELECT
@@ -340,7 +212,6 @@
       )
       QUALIFY
         ROW_NUMBER() OVER (PARTITION BY document_id ORDER BY submission_timestamp) = 1
-    {% endif %}
 ),
 overactive_org_mozilla_fenix AS (
   -- Find client_ids with over 150 000 pings in a day,
@@ -351,11 +222,7 @@
   FROM
     base_org_mozilla_fenix
   WHERE
-    {% if is_init() %}
-      submission_date >= '2018-01-01'
-    {% else %}
       submission_date = @submission_date
-    {% endif %}
   GROUP BY
     submission_date,
     client_id
@@ -381,61 +248,21 @@
     -- `mode_last` can result in struct with all null values if it’s most frequent (or latest among ties).
     -- This exclude structs with all null values so there will always be one non-NULL field.
     AND COALESCE(city, subdivision1, subdivision2, country) IS NOT NULL
-    {% if is_init() %}
-      AND submission_date >= '2018-01-01'
-    {% else %}
       AND submission_date = @submission_date
-    {% endif %}
   GROUP BY
     submission_date,
     client_id,
     sample_id
 ),
-{% if is_init() %}
-  clients_city_first_seen_org_mozilla_fenix AS (
-    SELECT
-      app_id,
-      client_id,
-      sample_id,
-      submission_date AS first_seen_city_date,
-      geo.city AS first_seen_city,
-      geo.subdivision1 AS first_seen_subdivision1,
-      geo.subdivision2 AS first_seen_subdivision2,
-      geo.country AS first_seen_country
-    FROM
-      clients_daily_org_mozilla_fenix
-    WHERE
-      geo.city IS NOT NULL
-    QUALIFY
-      ROW_NUMBER() OVER (PARTITION BY client_id, sample_id ORDER BY submission_date) = 1
-  ),
-  clients_city_last_seen_org_mozilla_fenix AS (
-    SELECT
-      app_id,
-      client_id,
-      sample_id,
-      submission_date AS last_seen_city_date,
-      geo.city AS last_seen_city,
-      geo.subdivision1 AS last_seen_subdivision1,
-      geo.subdivision2 AS last_seen_subdivision2,
-      geo.country AS last_seen_country
-    FROM
-      clients_daily_org_mozilla_fenix
-    WHERE
-      geo.city IS NOT NULL
-    QUALIFY
-      ROW_NUMBER() OVER (PARTITION BY client_id, sample_id ORDER BY submission_date DESC) = 1
-  ),
-{% else %}
-  _previous_org_mozilla_fenix AS (
+_previous_org_mozilla_fenix AS (
     SELECT
       *
     FROM
       `moz-fx-data-shared-prod.fenix_derived.baseline_clients_city_seen_v1`
     WHERE
       app_id = "org_mozilla_fenix"
-  ),
-  _current_org_mozilla_fenix AS (
+),
+_current_org_mozilla_fenix AS (
     SELECT
       app_id,
       client_id,
@@ -454,8 +281,7 @@
       clients_daily_org_mozilla_fenix
     WHERE
       geo.city IS NOT NULL
-  ),
-{% endif %}
+),
 base_org_mozilla_fenix_nightly AS (
   -- Live table dedup logic mimics copy_deduplicate
   SELECT
@@ -463,26 +289,14 @@
     DATE(submission_timestamp) AS submission_date,
     LOWER(client_info.client_id) AS client_id,
     sample_id,
-    mozfun.glean.parse_datetime(ping_info.end_time) AS parsed_end_time,
-    `moz-fx-data-shared-prod.udf.glean_timespan_seconds`(
-      metrics.timespan.glean_baseline_duration
-    ) AS duration,
     metadata.geo.city AS city,
     metadata.geo.subdivision1 AS subdivision1,
     metadata.geo.subdivision2 AS subdivision2,
     metadata.geo.country AS country
   FROM
-    {% if is_init() %}
-      `moz-fx-data-shared-prod.org_mozilla_fenix_nightly_stable.baseline_v1`
-    {% else %}
       `moz-fx-data-shared-prod.org_mozilla_fenix_nightly_live.baseline_v1`
-    {% endif %}
   WHERE
     client_info.client_id IS NOT NULL
-    {% if is_init() %}
-      AND sample_id = @sample_id
-      AND DATE(submission_timestamp) <= CURRENT_DATE()
-    {% else %}
       AND DATE(submission_timestamp) = @submission_date
       AND 'automation' NOT IN (
         SELECT
@@ -492,7 +306,6 @@
       )
       QUALIFY
         ROW_NUMBER() OVER (PARTITION BY document_id ORDER BY submission_timestamp) = 1
-    {% endif %}
 ),
 overactive_org_mozilla_fenix_nightly AS (
   -- Find client_ids with over 150 000 pings in a day,
@@ -503,11 +316,7 @@
   FROM
     base_org_mozilla_fenix_nightly
   WHERE
-    {% if is_init() %}
-      submission_date >= '2018-01-01'
-    {% else %}
       submission_date = @submission_date
-    {% endif %}
   GROUP BY
     submission_date,
     client_id
@@ -533,61 +342,21 @@
     -- `mode_last` can result in struct with all null values if it’s most frequent (or latest among ties).
     -- This exclude structs with all null values so there will always be one non-NULL field.
     AND COALESCE(city, subdivision1, subdivision2, country) IS NOT NULL
-    {% if is_init() %}
-      AND submission_date >= '2018-01-01'
-    {% else %}
       AND submission_date = @submission_date
-    {% endif %}
   GROUP BY
     submission_date,
     client_id,
     sample_id
 ),
-{% if is_init() %}
-  clients_city_first_seen_org_mozilla_fenix_nightly AS (
-    SELECT
-      app_id,
-      client_id,
-      sample_id,
-      submission_date AS first_seen_city_date,
-      geo.city AS first_seen_city,
-      geo.subdivision1 AS first_seen_subdivision1,
-      geo.subdivision2 AS first_seen_subdivision2,
-      geo.country AS first_seen_country
-    FROM
-      clients_daily_org_mozilla_fenix_nightly
-    WHERE
-      geo.city IS NOT NULL
-    QUALIFY
-      ROW_NUMBER() OVER (PARTITION BY client_id, sample_id ORDER BY submission_date) = 1
-  ),
-  clients_city_last_seen_org_mozilla_fenix_nightly AS (
-    SELECT
-      app_id,
-      client_id,
-      sample_id,
-      submission_date AS last_seen_city_date,
-      geo.city AS last_seen_city,
-      geo.subdivision1 AS last_seen_subdivision1,
-      geo.subdivision2 AS last_seen_subdivision2,
-      geo.country AS last_seen_country
-    FROM
-      clients_daily_org_mozilla_fenix_nightly
-    WHERE
-      geo.city IS NOT NULL
-    QUALIFY
-      ROW_NUMBER() OVER (PARTITION BY client_id, sample_id ORDER BY submission_date DESC) = 1
-  ),
-{% else %}
-  _previous_org_mozilla_fenix_nightly AS (
+_previous_org_mozilla_fenix_nightly AS (
     SELECT
       *
     FROM
       `moz-fx-data-shared-prod.fenix_derived.baseline_clients_city_seen_v1`
     WHERE
       app_id = "org_mozilla_fenix_nightly"
-  ),
-  _current_org_mozilla_fenix_nightly AS (
+),
+_current_org_mozilla_fenix_nightly AS (
     SELECT
       app_id,
       client_id,
@@ -606,8 +375,7 @@
       clients_daily_org_mozilla_fenix_nightly
     WHERE
       geo.city IS NOT NULL
-  ),
-{% endif %}
+),
 base_org_mozilla_fennec_aurora AS (
   -- Live table dedup logic mimics copy_deduplicate
   SELECT
@@ -615,26 +383,14 @@
     DATE(submission_timestamp) AS submission_date,
     LOWER(client_info.client_id) AS client_id,
     sample_id,
-    mozfun.glean.parse_datetime(ping_info.end_time) AS parsed_end_time,
-    `moz-fx-data-shared-prod.udf.glean_timespan_seconds`(
-      metrics.timespan.glean_baseline_duration
-    ) AS duration,
     metadata.geo.city AS city,
     metadata.geo.subdivision1 AS subdivision1,
     metadata.geo.subdivision2 AS subdivision2,
     metadata.geo.country AS country
   FROM
-    {% if is_init() %}
-      `moz-fx-data-shared-prod.org_mozilla_fennec_aurora_stable.baseline_v1`
-    {% else %}
       `moz-fx-data-shared-prod.org_mozilla_fennec_aurora_live.baseline_v1`
-    {% endif %}
   WHERE
     client_info.client_id IS NOT NULL
-    {% if is_init() %}
-      AND sample_id = @sample_id
-      AND DATE(submission_timestamp) <= CURRENT_DATE()
-    {% else %}
       AND DATE(submission_timestamp) = @submission_date
       AND 'automation' NOT IN (
         SELECT
@@ -644,7 +400,6 @@
       )
       QUALIFY
         ROW_NUMBER() OVER (PARTITION BY document_id ORDER BY submission_timestamp) = 1
-    {% endif %}
 ),
 overactive_org_mozilla_fennec_aurora AS (
   -- Find client_ids with over 150 000 pings in a day,
@@ -655,11 +410,7 @@
   FROM
     base_org_mozilla_fennec_aurora
   WHERE
-    {% if is_init() %}
-      submission_date >= '2018-01-01'
-    {% else %}
       submission_date = @submission_date
-    {% endif %}
   GROUP BY
     submission_date,
     client_id
@@ -685,61 +436,21 @@
     -- `mode_last` can result in struct with all null values if it’s most frequent (or latest among ties).
     -- This exclude structs with all null values so there will always be one non-NULL field.
     AND COALESCE(city, subdivision1, subdivision2, country) IS NOT NULL
-    {% if is_init() %}
-      AND submission_date >= '2018-01-01'
-    {% else %}
       AND submission_date = @submission_date
-    {% endif %}
   GROUP BY
     submission_date,
     client_id,
     sample_id
 ),
-{% if is_init() %}
-  clients_city_first_seen_org_mozilla_fennec_aurora AS (
-    SELECT
-      app_id,
-      client_id,
-      sample_id,
-      submission_date AS first_seen_city_date,
-      geo.city AS first_seen_city,
-      geo.subdivision1 AS first_seen_subdivision1,
-      geo.subdivision2 AS first_seen_subdivision2,
-      geo.country AS first_seen_country
-    FROM
-      clients_daily_org_mozilla_fennec_aurora
-    WHERE
-      geo.city IS NOT NULL
-    QUALIFY
-      ROW_NUMBER() OVER (PARTITION BY client_id, sample_id ORDER BY submission_date) = 1
-  ),
-  clients_city_last_seen_org_mozilla_fennec_aurora AS (
-    SELECT
-      app_id,
-      client_id,
-      sample_id,
-      submission_date AS last_seen_city_date,
-      geo.city AS last_seen_city,
-      geo.subdivision1 AS last_seen_subdivision1,
-      geo.subdivision2 AS last_seen_subdivision2,
-      geo.country AS last_seen_country
-    FROM
-      clients_daily_org_mozilla_fennec_aurora
-    WHERE
-      geo.city IS NOT NULL
-    QUALIFY
-      ROW_NUMBER() OVER (PARTITION BY client_id, sample_id ORDER BY submission_date DESC) = 1
-  )
-{% else %}
-  _previous_org_mozilla_fennec_aurora AS (
+_previous_org_mozilla_fennec_aurora AS (
     SELECT
       *
     FROM
       `moz-fx-data-shared-prod.fenix_derived.baseline_clients_city_seen_v1`
     WHERE
       app_id = "org_mozilla_fennec_aurora"
-  ),
-  _current_org_mozilla_fennec_aurora AS (
+),
+_current_org_mozilla_fennec_aurora AS (
     SELECT
       app_id,
       client_id,
@@ -758,110 +469,8 @@
       clients_daily_org_mozilla_fennec_aurora
     WHERE
       geo.city IS NOT NULL
-  )
-{% endif %}
-{% if is_init() %}
-  SELECT
-    app_id,
-    client_id,
-    sample_id,
-    first_seen_city_date,
-    first_seen_city,
-    first_seen_subdivision1,
-    first_seen_subdivision2,
-    first_seen_country,
-    last_seen_city_date,
-    last_seen_city,
-    last_seen_subdivision1,
-    last_seen_subdivision2,
-    last_seen_country
-  FROM
-    clients_city_first_seen_org_mozilla_firefox cfs
-  FULL OUTER JOIN
-    clients_city_last_seen_org_mozilla_firefox cls
-    USING (client_id, sample_id, app_id)
-  UNION ALL
-  SELECT
-    app_id,
-    client_id,
-    sample_id,
-    first_seen_city_date,
-    first_seen_city,
-    first_seen_subdivision1,
-    first_seen_subdivision2,
-    first_seen_country,
-    last_seen_city_date,
-    last_seen_city,
-    last_seen_subdivision1,
-    last_seen_subdivision2,
-    last_seen_country
-  FROM
-    clients_city_first_seen_org_mozilla_firefox_beta cfs
-  FULL OUTER JOIN
-    clients_city_last_seen_org_mozilla_firefox_beta cls
-    USING (client_id, sample_id, app_id)
-  UNION ALL
-  SELECT
-    app_id,
-    client_id,
-    sample_id,
-    first_seen_city_date,
-    first_seen_city,
-    first_seen_subdivision1,
-    first_seen_subdivision2,
-    first_seen_country,
-    last_seen_city_date,
-    last_seen_city,
-    last_seen_subdivision1,
-    last_seen_subdivision2,
-    last_seen_country
-  FROM
-    clients_city_first_seen_org_mozilla_fenix cfs
-  FULL OUTER JOIN
-    clients_city_last_seen_org_mozilla_fenix cls
-    USING (client_id, sample_id, app_id)
-  UNION ALL
-  SELECT
-    app_id,
-    client_id,
-    sample_id,
-    first_seen_city_date,
-    first_seen_city,
-    first_seen_subdivision1,
-    first_seen_subdivision2,
-    first_seen_country,
-    last_seen_city_date,
-    last_seen_city,
-    last_seen_subdivision1,
-    last_seen_subdivision2,
-    last_seen_country
-  FROM
-    clients_city_first_seen_org_mozilla_fenix_nightly cfs
-  FULL OUTER JOIN
-    clients_city_last_seen_org_mozilla_fenix_nightly cls
-    USING (client_id, sample_id, app_id)
-  UNION ALL
-  SELECT
-    app_id,
-    client_id,
-    sample_id,
-    first_seen_city_date,
-    first_seen_city,
-    first_seen_subdivision1,
-    first_seen_subdivision2,
-    first_seen_country,
-    last_seen_city_date,
-    last_seen_city,
-    last_seen_subdivision1,
-    last_seen_subdivision2,
-    last_seen_country
-  FROM
-    clients_city_first_seen_org_mozilla_fennec_aurora cfs
-  FULL OUTER JOIN
-    clients_city_last_seen_org_mozilla_fennec_aurora cls
-    USING (client_id, sample_id, app_id)
-{% else %}
-  SELECT
+)
+SELECT
 -- _p.* fields are NULL for clients that are not yet captured in the baseline_city_seen derived table.
     IF(_p.app_id IS NULL, _c.app_id, _p.app_id) AS app_id,
     IF(_p.client_id IS NULL, _c.client_id, _p.client_id) AS client_id,
@@ -913,13 +522,13 @@
       _c.last_seen_country,
       _p.last_seen_country
     ) AS last_seen_country
-  FROM
+FROM
     _current_org_mozilla_firefox AS _c
-  FULL JOIN
+FULL JOIN
     _previous_org_mozilla_firefox AS _p
     USING (client_id, sample_id, app_id)
-  UNION ALL
-  SELECT
+UNION ALL
+SELECT
 -- _p.* fields are NULL for clients that are not yet captured in the baseline_city_seen derived table.
     IF(_p.app_id IS NULL, _c.app_id, _p.app_id) AS app_id,
     IF(_p.client_id IS NULL, _c.client_id, _p.client_id) AS client_id,
@@ -971,13 +580,13 @@
       _c.last_seen_country,
       _p.last_seen_country
     ) AS last_seen_country
-  FROM
+FROM
     _current_org_mozilla_firefox_beta AS _c
-  FULL JOIN
+FULL JOIN
     _previous_org_mozilla_firefox_beta AS _p
     USING (client_id, sample_id, app_id)
-  UNION ALL
-  SELECT
+UNION ALL
+SELECT
 -- _p.* fields are NULL for clients that are not yet captured in the baseline_city_seen derived table.
     IF(_p.app_id IS NULL, _c.app_id, _p.app_id) AS app_id,
     IF(_p.client_id IS NULL, _c.client_id, _p.client_id) AS client_id,
@@ -1029,13 +638,13 @@
       _c.last_seen_country,
       _p.last_seen_country
     ) AS last_seen_country
-  FROM
+FROM
     _current_org_mozilla_fenix AS _c
-  FULL JOIN
+FULL JOIN
     _previous_org_mozilla_fenix AS _p
     USING (client_id, sample_id, app_id)
-  UNION ALL
-  SELECT
+UNION ALL
+SELECT
 -- _p.* fields are NULL for clients that are not yet captured in the baseline_city_seen derived table.
     IF(_p.app_id IS NULL, _c.app_id, _p.app_id) AS app_id,
     IF(_p.client_id IS NULL, _c.client_id, _p.client_id) AS client_id,
@@ -1087,13 +696,13 @@
       _c.last_seen_country,
       _p.last_seen_country
     ) AS last_seen_country
-  FROM
+FROM
     _current_org_mozilla_fenix_nightly AS _c
-  FULL JOIN
+FULL JOIN
     _previous_org_mozilla_fenix_nightly AS _p
     USING (client_id, sample_id, app_id)
-  UNION ALL
-  SELECT
+UNION ALL
+SELECT
 -- _p.* fields are NULL for clients that are not yet captured in the baseline_city_seen derived table.
     IF(_p.app_id IS NULL, _c.app_id, _p.app_id) AS app_id,
     IF(_p.client_id IS NULL, _c.client_id, _p.client_id) AS client_id,
@@ -1145,9 +754,8 @@
       _c.last_seen_country,
       _p.last_seen_country
     ) AS last_seen_country
-  FROM
+FROM
     _current_org_mozilla_fennec_aurora AS _c
-  FULL JOIN
+FULL JOIN
     _previous_org_mozilla_fennec_aurora AS _p
     USING (client_id, sample_id, app_id)
-{% endif %}
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/engagement_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/engagement_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/engagement_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/engagement_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -42,7 +42,7 @@
   enabled: true
   collection: Operational Checks
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/metrics_clients_daily_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/metrics_clients_daily_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/metrics_clients_daily_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/metrics_clients_daily_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -38,7 +38,7 @@
   enabled: true
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/metrics_clients_last_seen_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/metrics_clients_last_seen_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/metrics_clients_last_seen_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/metrics_clients_last_seen_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -48,7 +48,7 @@
   enabled: true
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profile_activation_clients_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profile_activation_clients_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profile_activation_clients_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profile_activation_clients_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -44,7 +44,7 @@
   enabled: true
   collection: Operational Checks
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profile_activations_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profile_activations_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profile_activations_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profile_activations_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -41,7 +41,7 @@
   enabled: true
   collection: Operational Checks
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profile_clients_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profile_clients_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profile_clients_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profile_clients_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -46,7 +46,7 @@
   enabled: true
   collection: Operational Checks
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profiles_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profiles_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profiles_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/new_profiles_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -41,7 +41,7 @@
   enabled: true
   collection: Operational Checks
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/retention_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/retention_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/retention_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/retention_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -51,7 +51,7 @@
   enabled: true
   collection: Operational Checks
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/usage_reporting_active_users_aggregates_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/usage_reporting_active_users_aggregates_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/usage_reporting_active_users_aggregates_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/fenix_derived/usage_reporting_active_users_aggregates_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -36,7 +36,7 @@
   enabled: true
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter/crash/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter/crash/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter/crash/metadata.yaml	2025-10-14 17:18:31.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter/crash/metadata.yaml	2025-10-14 17:34:26.000000000 +0000
@@ -1,6 +1,14 @@
-friendly_name: Crash
+friendly_name: Historical Pings for `firefox-crashreporter/crash`
 description: |-
-  Please provide a description for the query
+  A historical view of pings sent for the
+  `firefox-crashreporter/crash`
+  document type.
+
+  This view is guaranteed to contain only complete days
+  (per `submission_timestamp`)
+  and to contain only one row per distinct `document_id` within a given date.
+
+  Clustering fields: `normalized_channel`, `sample_id`
 owners: []
 labels:
   authorized: true
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/baseline_clients_daily_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/baseline_clients_daily_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/baseline_clients_daily_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/baseline_clients_daily_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -39,7 +39,7 @@
   enabled: false
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/baseline_clients_first_seen_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/baseline_clients_first_seen_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/baseline_clients_first_seen_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/baseline_clients_first_seen_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -49,7 +49,7 @@
   enabled: false
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/baseline_clients_last_seen_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/baseline_clients_last_seen_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/baseline_clients_last_seen_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/baseline_clients_last_seen_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -48,7 +48,7 @@
   enabled: false
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/metrics_clients_daily_v1/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/metrics_clients_daily_v1/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/metrics_clients_daily_v1/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_crashreporter_derived/metrics_clients_daily_v1/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -34,7 +34,7 @@
   enabled: false
   collection: null
   partition_column: null
-  partition_column_set: true
+  partition_column_set: false
   freshness:
     blocking: false
   volume:
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/baseline_active_users/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/baseline_active_users/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/baseline_active_users/schema.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/baseline_active_users/schema.yaml	2025-10-14 17:25:03.000000000 +0000
@@ -37,8 +37,8 @@
 - name: sample_id
   type: INTEGER
   mode: NULLABLE
-  description: A number, 0-99, that samples by client_id and allows filtering data for analysis.
-    It is a pipeline-generated artifact that should match between pings.
+  description: A number, 0-99, that samples by client_id and allows filtering data
+    for analysis. It is a pipeline-generated artifact that should match between pings.
 - name: first_run_date
   type: DATE
   mode: NULLABLE
@@ -55,7 +55,8 @@
 - name: android_sdk_version
   type: STRING
   mode: NULLABLE
-  description: The optional Android specific SDK version of the software running on this hardware device.
+  description: The optional Android specific SDK version of the software running on
+    this hardware device.
 - name: locale
   type: STRING
   mode: NULLABLE
@@ -68,8 +69,8 @@
 - name: country
   type: STRING
   mode: NULLABLE
-  description: Name of the country in which the activity took place, as determined by
-    the IP geolocation.
+  description: Name of the country in which the activity took place, as determined
+    by the IP geolocation.
 - name: app_build
   type: STRING
   mode: NULLABLE
@@ -84,8 +85,8 @@
 - name: device_manufacturer
   type: STRING
   mode: NULLABLE
-  description: The manufacturer of the device the application is running on.
-    Not set if the device manufacturer can't be determined (e.g. on Desktop).
+  description: The manufacturer of the device the application is running on. Not set
+    if the device manufacturer can't be determined (e.g. on Desktop).
 - name: device_model
   type: STRING
   mode: NULLABLE
@@ -93,7 +94,8 @@
 - name: telemetry_sdk_build
   type: STRING
   mode: NULLABLE
-  description: The version of the Glean SDK at the time the ping was collected (e.g. 25.0.0).
+  description: The version of the Glean SDK at the time the ping was collected (e.g.
+    25.0.0).
 - name: first_seen_date
   type: DATE
   mode: NULLABLE
@@ -104,18 +106,21 @@
 - name: isp
   type: STRING
   mode: NULLABLE
-  description: The name of the internet service provider associated with the client's IP address.
+  description: The name of the internet service provider associated with the client's
+    IP address.
 - name: days_active_bits
   type: INTEGER
   mode: NULLABLE
 - name: geo_subdivision
   type: STRING
   mode: NULLABLE
-  description: First major country subdivision, typically a state, province, or county based on IP address.
+  description: First major country subdivision, typically a state, province, or county
+    based on IP address.
 - name: profile_group_id
   type: STRING
   mode: NULLABLE
-  description: A UUID uniquely identifying the profile group, not shared with other telemetry data.
+  description: A UUID uniquely identifying the profile group, not shared with other
+    telemetry data.
 - name: install_source
   type: STRING
   mode: NULLABLE
@@ -137,7 +142,8 @@
 - name: is_default_browser
   type: BOOLEAN
   mode: NULLABLE
-  description: A flag indicating whether the browser is set as the default browser on the client side.
+  description: A flag indicating whether the browser is set as the default browser
+    on the client side.
 - name: attribution_dltoken
   type: STRING
   mode: NULLABLE
@@ -242,8 +248,8 @@
 - name: activity_segment
   type: STRING
   mode: NULLABLE
-  description: Classification of users based on their browsing activity.
-    E.g., infrequent, casual, regular.
+  description: Classification of users based on their browsing activity. E.g., infrequent,
+    casual, regular.
 - name: first_seen_year
   type: INTEGER
   mode: NULLABLE
@@ -251,27 +257,33 @@
 - name: is_daily_user
   type: BOOLEAN
   mode: NULLABLE
-  description: Flag indicating if client is considered a daily user on the submission date.
+  description: Flag indicating if client is considered a daily user on the submission
+    date.
 - name: is_weekly_user
   type: BOOLEAN
   mode: NULLABLE
-  description: Flag indicating if client is considered a weekly user on the submission date.
+  description: Flag indicating if client is considered a weekly user on the submission
+    date.
 - name: is_monthly_user
   type: BOOLEAN
   mode: NULLABLE
-  description: Flag indicating if client is considered a monthly user on the submission date.
+  description: Flag indicating if client is considered a monthly user on the submission
+    date.
 - name: is_dau
   type: BOOLEAN
   mode: NULLABLE
-  description: Flag indicating the client is counted as a daily active user on this submission date.
+  description: Flag indicating the client is counted as a daily active user on this
+    submission date.
 - name: is_wau
   type: BOOLEAN
   mode: NULLABLE
-  description: Flag indicating the client is counted as a weekly active user on this submission date.
+  description: Flag indicating the client is counted as a weekly active user on this
+    submission date.
 - name: is_mau
   type: BOOLEAN
   mode: NULLABLE
-  description: Flag indicating the client is counted as a weekly active user on this submission date.
+  description: Flag indicating the client is counted as a weekly active user on this
+    submission date.
 - name: attribution_campaign
   type: STRING
   mode: NULLABLE
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/broken_site_report/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/broken_site_report/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/broken_site_report/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/broken_site_report/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -1,6 +1,14 @@
-friendly_name: Broken Site Report
+friendly_name: Historical Pings for `firefox-desktop/broken-site-report`
 description: |-
-  Please provide a description for the query
+  A historical view of pings sent for the
+  `firefox-desktop/broken-site-report`
+  document type.
+
+  This view is guaranteed to contain only complete days
+  (per `submission_timestamp`)
+  and to contain only one row per distinct `document_id` within a given date.
+
+  Clustering fields: `normalized_channel`, `sample_id`
 owners: []
 labels:
   authorized: true
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/crash/metadata.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/crash/metadata.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/crash/metadata.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/crash/metadata.yaml	2025-10-14 17:34:24.000000000 +0000
@@ -1,6 +1,14 @@
-friendly_name: Crash
+friendly_name: Historical Pings for `firefox-desktop/crash`
 description: |-
-  Please provide a description for the query
+  A historical view of pings sent for the
+  `firefox-desktop/crash`
+  document type.
+
+  This view is guaranteed to contain only complete days
+  (per `submission_timestamp`)
+  and to contain only one row per distinct `document_id` within a given date.
+
+  Clustering fields: `normalized_channel`, `sample_id`
 owners: []
 labels:
   authorized: true
diff -bur --no-dereference --new-file /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/ltv_states/schema.yaml /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/ltv_states/schema.yaml
--- /tmp/workspace/main-generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/ltv_states/schema.yaml	2025-10-14 17:18:32.000000000 +0000
+++ /tmp/workspace/generated-sql/sql/moz-fx-data-shared-prod/firefox_desktop/ltv_states/schema.yaml	2025-10-14 17:25:07.000000000 +0000
@@ -1,64 +1,66 @@
 fields:
-- description: Unique ID for the client installation.
-  mode: NULLABLE
-  name: client_id
+- name: client_id
   type: STRING
-- description: Sample ID - A number ranging from 0 - 99 based on client ID; used to pull a small sample of data related to a subset of clients over time
   mode: NULLABLE
-  name: sample_id
-  type: INT64
-- description: Submission Date
+  description: Unique ID for the client installation.
+- name: sample_id
+  type: INTEGER
   mode: NULLABLE
-  name: submission_date
+  description: Sample ID - A number ranging from 0 - 99 based on client ID; used to
+    pull a small sample of data related to a subset of clients over time
+- name: submission_date
   type: DATE
-- description: First Seen Date - The date this client was first seen
   mode: NULLABLE
-  name: first_seen_date
+  description: Submission Date
+- name: first_seen_date
   type: DATE
-- description: Days Since First Seen - The number of days since the client was first seen
   mode: NULLABLE
-  name: days_since_first_seen
-  type: INT64
-- description: Days Since Active
+  description: First Seen Date - The date this client was first seen
+- name: days_since_first_seen
+  type: INTEGER
   mode: NULLABLE
-  name: days_since_active
-  type: INT64
-- description: First Reported Country - The country this client ID was first reported from
+  description: Days Since First Seen - The number of days since the client was first
+    seen
+- name: days_since_active
+  type: INTEGER
   mode: NULLABLE
-  name: first_reported_country
+  description: Days Since Active
+- name: first_reported_country
   type: STRING
-- description: Attribution
   mode: NULLABLE
-  name: attribution
+  description: First Reported Country - The country this client ID was first reported
+    from
+- name: attribution
   type: RECORD
+  mode: NULLABLE
   fields:
-  - mode: NULLABLE
-    name: source
+  - name: source
     type: STRING
+    mode: NULLABLE
     description: Attribution Source
-  - mode: NULLABLE
-    name: medium
+  - name: medium
     type: STRING
+    mode: NULLABLE
     descript

⚠️ Only part of the diff is displayed.

Link to full diff