string formatting fixes

Author: fvankrieken

products/cscl/models/log_files/log__lion_centerline_or_proto_seglocstatus_mismatch.sql

@@ -14,24 +14,24 @@ joined AS (
         lion.segmentid,
         lion.segment_locational_status,
         CASE
-            WHEN lion.source_feature_layer = 'centerline' THEN centerline.seglocstatus
-            WHEN lion.source_feature_layer = 'altsegmentdata' THEN proto.seglocstatus
+            WHEN lion.source_table = 'centerline' THEN centerline.seglocstatus
+            WHEN lion.source_table = 'altsegmentdata' THEN proto.seglocstatus
         END AS source_segment_locational_status,
-        lion.source_feature_layer
+        lion.source_table
     FROM lion
-    LEFT JOIN centerline ON lion.source_feature_layer = 'centerline' AND lion.segmentid = centerline.segmentid
-    LEFT JOIN proto ON lion.source_feature_layer = 'altsegmentdata' AND lion.globalid = proto.globalid
-    WHERE lion.source_feature_layer IN ('centerline', 'altsegmentdata')
+    LEFT JOIN centerline ON lion.source_table = 'centerline' AND lion.segmentid = centerline.segmentid
+    LEFT JOIN proto ON lion.source_table = 'altsegmentdata' AND lion.globalid = proto.globalid
+    WHERE lion.source_table IN ('centerline', 'altsegmentdata')
 )
 SELECT
     'seglocstatus mismatch' As error_category,
     globalid,
-    source_feature_layer,
+    source_table AS source_feature_layer,
     'segmentid' AS record_id_type,
     segmentid AS record_id,
     FORMAT(
-        'Segment from feature layer % with globalid % has calculated seglocstatus % and source field seglocstatus %',
-        source_feature_layer,
+        'Segment from feature layer %s with globalid %s has calculated seglocstatus %s and source field seglocstatus %s',
+        source_table,
         globalid,
         segment_locational_status,
         source_segment_locational_status

products/cscl/models/log_files/log__lion_protosegment_orphans.sql

@@ -1,13 +1,8 @@
 SELECT
     'protosegment without geometry-modeled segment' As error_category,
     globalid,
-    source_feature_layer,
+    source_table AS source_feature_layer,
     'segmentid' AS record_id_type,
-    segmentid AS record_id,
-    FORMAT(
-        'Protosegment with globalid % and segmentid % has no corresponding geometry-modeled segment.',
-        globalid,
-        segmentid
-    ) AS message
+    segmentid AS record_id
 FROM {{ ref('int__protosegments') }}
 WHERE geom IS NULL

products/cscl/models/log_files/log__lion_segments_ap_boro_mismatch.sql

@@ -7,17 +7,20 @@ aps AS (
 SELECT
     'neither joined atomic polygon matches segment''s borocode' As error_category,
     segments.globalid,
-    segments.source_feature_layer,
+    segments.source_table AS source_feature_layer,
     'segmentid' AS record_id_type,
     segments.segmentid AS record_id,
     FORMAT(
-        'Segment from feature layer % with globalid % has boro %, '
-        || 'left atomic polygon boro % and right atomic polygon boro %',
-        source_feature_layer,
-        globalid,
-        segment_borocode,
-        left_borocode,
-        right_borocode
+        'Segment from feature layer %s with globalid %s has boro %s, '
+        || 'left atomic polygon with atomicid "%s" has boro "%s", '
+        || 'and right atomic polygon with atomicid "%s" has boro "%s".',
+        segments.source_table,
+        segments.globalid,
+        aps.segment_borocode,
+        aps.left_atomicid,
+        aps.left_borocode,
+        aps.right_atomicid,
+        aps.right_borocode
     ) AS message
 FROM aps
 INNER JOIN segments ON aps.globalid = segments.globalid

products/cscl/models/log_files/log__lion_segments_missing_aps.sql

@@ -1,7 +1,7 @@
 SELECT
     'segment joined to no atomic polygon' As error_category,
     globalid,
-    source_feature_layer,
+    source_table AS source_feature_layer,
     'segmentid' AS record_id_type,
     segmentid AS record_id,
     '' AS message

products/cscl/models/log_files/log__lion_segments_missing_facecode.sql

@@ -10,7 +10,7 @@ WITH segments AS (
 SELECT DISTINCT
     'missing facecode' As error_category,
     globalid,
-    source_feature_layer,
+    source_table AS source_feature_layer,
     'segmentid' AS record_id_type,
     segmentid AS record_id,
     '' AS message

products/cscl/models/log_files/log__lion_segments_missing_nodes.sql

@@ -1,7 +1,7 @@
 SELECT
     'segment missing node' As error_category,
     globalid,
-    source_feature_layer,
+    source_table AS source_feature_layer,
     'segmentid' AS record_id_type,
     segmentid AS record_id,
     '' AS message

products/cscl/models/log_files/log__lion_segments_missing_nypd.sql

@@ -7,7 +7,7 @@ nypd AS (
 SELECT
     'segment joined to no nypd beat' As error_category,
     segments.globalid,
-    segments.source_feature_layer,
+    segments.source_table AS source_feature_layer,
     'segmentid' AS record_id_type,
     segments.segmentid AS record_id,
     '' AS message