Be less clever with jinja, explicitly list column names

cagov · Sep 5, 2023 · d982dd2 · d982dd2
1 parent 609d710
commit d982dd2
Showing 1 changed file with 20 additions and 34 deletions.
diff --git a/transform/models/marts/geo_reference/geo_reference__building_footprints_with_tiger.sql b/transform/models/marts/geo_reference/geo_reference__building_footprints_with_tiger.sql
@@ -1,31 +1,14 @@
-/* Columns selected and renamed from footprints, blocks, and places
-are reused in several places. To avoid repeating them with the possibility
-for errors, we set them in lists/dictionaries where appropriate. */
-{%- set footprint_cols = ['"release"', '"capture_dates_range"'] -%}
-
-{%- set block_cols = {
-      '"COUNTYFP20"': '"county_fips"',
-      '"TRACTCE20"': '"tract"',
-      '"BLOCKCE20"': '"block"',
-      '"GEOID20"': '"block_geoid"',
-  }
--%}
-
-{%- set place_cols = {
-     '"PLACEFP"': '"place_fips"',
-     '"PLACENS"': '"place_ns"',
-     '"GEOID"': '"place_geoid"',
-     '"NAME"': '"place_name"',
-     '"CLASSFP"': '"class_fips_code"',
-  }
--%}
-
 with footprints as (
-    select * from {{ source('building_footprints', 'california_building_footprints') }}
+    select
+        "release",
+        "capture_dates_range",
+        "geometry"
+    from {{ source('building_footprints', 'california_building_footprints') }}
 ),
 
 blocks_source as (
-    select * from {{ source('tiger_2022', 'blocks') }}
+    select *
+    from {{ source('tiger_2022', 'blocks') }}
 ),
 
 places_source as (
@@ -34,18 +17,21 @@ places_source as (
 
 blocks as (
     select
-        {% for k, v in block_cols.items() -%}
-            {{ k }} as {{ v }},
-        {% endfor -%}
+        "COUNTYFP20" as "county_fips",
+        "TRACTCE20" as "tract",
+        "BLOCKCE20" as "block",
+        "GEOID20" as "block_geoid",
         "geometry"
     from blocks_source
 ),
 
 places as (
     select
-        {% for k, v in place_cols.items() -%}
-            {{ k }} as {{ v }},
-        {% endfor -%}
+        "PLACEFP" as "place_fips",
+        "PLACENS" as "place_ns",
+        "GEOID" as "place_geoid",
+        "NAME" as "place_name",
+        "CLASSFP" as "class_fips_code",
         {{ map_class_fips("CLASSFP") }} as "class_fips",
         "geometry"
     from places_source
@@ -55,8 +41,8 @@ footprints_with_blocks as (
     {{ spatial_join_with_deduplication(
        "footprints",
        "blocks",
-       footprint_cols,
-       block_cols.values(),
+       ['"release"', '"capture_dates_range"'],
+       ['"county_fips"', '"tract"', '"block"', '"block_geoid"'],
        left_geom='"geometry"',
        right_geom='"geometry"',
        kind="inner",
@@ -68,8 +54,8 @@ footprints_with_blocks_and_places as (
     {{ spatial_join_with_deduplication(
        "footprints_with_blocks",
        "places",
-       footprint_cols + block_cols.values() | list,
-       place_cols.values() | list + ['"class_fips"'],
+       ['"release"', '"capture_dates_range"', '"county_fips"', '"tract"', '"block"', '"block_geoid"'],
+       ['"place_fips"', '"place_ns"', '"place_geoid"', '"place_name"', '"class_fips_code"', '"class_fips"'],
        left_geom='"geometry"',
        right_geom='"geometry"',
        kind="left",