Merge pull request #7 from dataform-co/dataform_fix_timestamp_issue

specifically reference timestamp fields for BQ & redshist/postgres support

Author: DanLee

includes/page_events.js

@@ -14,14 +14,14 @@ module.exports = (params) => {
 
 -- format page calls into a format suitable to join with track calls
 select
-  "timestamp",
+  pages.timestamp,
   user_id,
   anonymous_id,
   id as page_id,
   ${Object.entries({...segmentCommon.PAGE_FIELDS, ...segmentCommon.customPageFieldsObj}).map(
       ([key, value]) => `${key} as ${value}`).join(",\n    ")}
 from
-  ${ctx.ref(params.segmentSchema, "pages")}
+  ${ctx.ref(params.segmentSchema, "pages")} as pages
 
 `)
 }

includes/sessionized_events.js

@@ -8,28 +8,28 @@ module.exports = (params) => {
 with segment_events_combined as (
 -- combine page and track tables into a full events table
 select
-  "timestamp",
+  track_events.timestamp,
   user_id,
   anonymous_id,
   track_id,
   null as page_id
 from 
-  ${params.segmentSchema, ctx.ref("segment_track_events")}
+  ${params.segmentSchema, ctx.ref("segment_track_events")} as track_events
 union all
 select
-  "timestamp",
+  page_events.timestamp,
   user_id,
   anonymous_id,
   null as track_id,
   page_id
 from 
-  ${params.segmentSchema, ctx.ref("segment_page_events")}
+  ${params.segmentSchema, ctx.ref("segment_page_events")} as page_events
 ),
 
 segment_events_mapped as (
 -- map anonymous_id to user_id (where possible)
 select
-  "timestamp",
+  segment_events_combined.timestamp,
   coalesce(
     segment_events_combined.user_id,
     segment_user_anonymous_map.user_id,
@@ -49,7 +49,7 @@ select
   *,
   coalesce(
     (
-      ${crossdb.timestampDiff(`millisecond`, `"timestamp"`,
+      ${crossdb.timestampDiff(`millisecond`, `segment_events_mapped.timestamp`,
       crossdb.windowFunction({
         func: "lag",
         value: "timestamp",
@@ -75,7 +75,7 @@ select
         value: "case when session_start_event then 1 else 0 end",
         ignore_nulls: false,
         partition_fields: "user_id",
-        order_fields: '"timestamp" asc',
+        order_fields: 'session_starts.timestamp asc',
         frame_clause: "rows between unbounded preceding and current row"
       })} as session_index
 from

includes/sessions.js

@@ -22,18 +22,18 @@ select distinct
         value: value,
         ignore_nulls: true,
         partition_fields: "session_id",
-        order_fields: '"timestamp" asc',
+        order_fields: 'sessionized_pages.timestamp asc',
       })} as first_${value}`).join(",\n  ")},
   ${Object.entries({...segmentCommon.PAGE_FIELDS, ...segmentCommon.customPageFieldsObj}).map(
       ([key, value]) => `${crossdb.windowFunction({
         func: "last_value",
         value: value,
         ignore_nulls: true,
         partition_fields: "session_id",
-        order_fields: '"timestamp" asc',
+        order_fields: 'sessionized_pages.timestamp asc',
       })} as last_${value}`).join(",\n  ")}
   from
-    ${ctx.ref(params.defaultConfig.schema, "segment_sessionized_pages")}
+    ${ctx.ref(params.defaultConfig.schema, "segment_sessionized_pages")} as sessionized_pages
   )
 
 select

includes/track_events.js

@@ -12,13 +12,13 @@ module.exports = (params) => {
 
 -- format track calls into a format suitable to join with page calls
 select
-  "timestamp",
+  tracks.timestamp,
   user_id,
   anonymous_id,
   id as track_id,
   ${Object.entries({...segmentCommon.TRACK_FIELDS, ...segmentCommon.customTrackFieldsObj}).map(
       ([key, value]) => `${key} as ${value}`).join(",\n    ")}
 from
-  ${ctx.ref(params.segmentSchema, "tracks")}
+  ${ctx.ref(params.segmentSchema, "tracks")} as tracks
 `)
 }

includes/user_map.js

@@ -43,7 +43,7 @@ select distinct
         value: "user_id",
         ignore_nulls: false,
         partition_fields: "anonymous_id",
-        order_fields: '"timestamp" asc',
+        order_fields: "anonymous_id_user_id_pairs.timestamp asc",
       })} as user_id
 from
   anonymous_id_user_id_pairs

includes/users.js

@@ -20,18 +20,18 @@ select distinct
   ${USER} as user_id,
   ${crossdb.windowFunction({
         func: "first_value",
-        value: '"timestamp"',
+        value: "identifies.timestamp",
         ignore_nulls: true,
         partition_fields: USER,
-        order_fields: '"timestamp" asc',
+        order_fields: "identifies.timestamp asc",
       })} as timestamp
   ${params.customUserFields.length ? `,` : ``}
   ${params.customUserFields.map(f=> `${crossdb.windowFunction({
         func: "first_value",
         value: f,
         ignore_nulls: true,
         partition_fields: USER,
-        order_fields: '"timestamp" desc',
+        order_fields: "identifies.timestamp desc",
       })} as ${f}`).join(",\n  ")}
 from
   ${ctx.ref(params.defaultConfig.schema, "segment_user_map")} as segment_user_anonymous_map