Merge pull request #12 from dataform-co/dataform_session_to_dataform

switch from `session.config` to `dataform.projectConfig`

Author: DanLee

includes/crossdb.js

@@ -5,7 +5,7 @@ function typeString(warehouse) {
     postgres: "varchar",
     snowflake: "varchar",
     sqldatawarehouse: "string",
-  })[warehouse || session.config.warehouse];
+  })[warehouse || dataform.projectConfig.warehouse];
 }
 
 function timestampDiff(date_part, start_timestamp, end_timestamp, warehouse) {
@@ -21,7 +21,7 @@ function timestampDiff(date_part, start_timestamp, end_timestamp, warehouse) {
     } [date_part.toLowerCase()],
     snowflake: `datediff(${date_part}, ${start_timestamp}, ${end_timestamp})`,
     sqldatawarehouse: `datediff(${date_part}, ${start_timestamp}, ${end_timestamp})`
-  })[warehouse || session.config.warehouse];
+  })[warehouse || dataform.projectConfig.warehouse];
 }
 
 function generateSurrogateKey(id_array, warehouse) {
@@ -31,7 +31,7 @@ function generateSurrogateKey(id_array, warehouse) {
     postgres: `md5(concat(${id_array.map((id) => (`cast(${id} as ${typeString()})`)).join(`,`)}))`,
     snowflake: `md5(concat(${id_array.map((id) => (`cast(${id} as ${typeString()})`)).join(`,`)}))`,
     sqldatawarehouse: `hashbytes("md5", (concat(${id_array.map((id) => (`cast(${id} as ${typeString()})`)).join(`,`)})))`,
-  })[warehouse || session.config.warehouse];
+  })[warehouse || dataform.projectConfig.warehouse];
 }
 
 function windowFunction({
@@ -49,7 +49,7 @@ function windowFunction({
     postgres: `${func}(${value}) over (partition by ${partition_fields} order by ${ignore_nulls ? `case when ${value} is not null then 0 else 1 end asc` : ``} ${order_fields && ignore_nulls ? `,` : ``} ${order_fields} ${frame_clause ? frame_clause : `rows between unbounded preceding and unbounded following`})`,
     snowflake: `${func}(${value} ${ignore_nulls ? `ignore nulls` : ``}) over (partition by ${partition_fields} order by ${order_fields} ${frame_clause ? frame_clause : ``})`,
     sqldatawarehouse: `${func}(${value} ${ignore_nulls ? `ignore nulls` : ``}) over (partition by ${partition_fields} order by ${order_fields} ${frame_clause ? frame_clause : ``})`,
-  })[warehouse || session.config.warehouse];
+  })[warehouse || dataform.projectConfig.warehouse];
 }
 
 module.exports = {

includes/sessions.js

@@ -81,38 +81,38 @@ select
   max(segment_sessionized_events.timestamp) as session_end_timestamp,
   
   -- stats about the session
-  ${ctx.when(global.session.config.warehouse == "bigquery", `struct(\n  `)}
+  ${ctx.when(global.dataform.projectConfig.warehouse == "bigquery", `struct(\n  `)}
   ${segmentCommon.enabledEvents(params).map((event) => 
     `count(segment_sessionized_events.${event}_id) as total_${event}s`).join(`,\n  `)},
   ${crossdb.timestampDiff("millisecond", "min(segment_sessionized_events.timestamp)", "max(segment_sessionized_events.timestamp)")} as duration_millis
-  ${ctx.when(global.session.config.warehouse == "bigquery", `) as stats`)}
+  ${ctx.when(global.dataform.projectConfig.warehouse == "bigquery", `) as stats`)}
 
   -- first values in the session for page fields
   ${params.includePages ? 
-  `, ${ctx.when(global.session.config.warehouse == "bigquery", `struct(\n  `)}
+  `, ${ctx.when(global.dataform.projectConfig.warehouse == "bigquery", `struct(\n  `)}
   ${Object.entries(segmentCommon.allPageFields(params)).map(
       ([key, value]) => `first_and_last_page_values.first_${value}`).join(",\n  ")}
-  ${ctx.when(global.session.config.warehouse == "bigquery", `) as first_page_values`)},
+  ${ctx.when(global.dataform.projectConfig.warehouse == "bigquery", `) as first_page_values`)},
   -- last values in the session for page fields
-  ${ctx.when(global.session.config.warehouse == "bigquery", `struct(\n  `)}
+  ${ctx.when(global.dataform.projectConfig.warehouse == "bigquery", `struct(\n  `)}
   ${Object.entries(segmentCommon.allPageFields(params)).map(
       ([key, value]) => `first_and_last_page_values.last_${value}`).join(",\n  ")}
-  ${ctx.when(global.session.config.warehouse == "bigquery", `) as last_page_values`)}` : `` }
+  ${ctx.when(global.dataform.projectConfig.warehouse == "bigquery", `) as last_page_values`)}` : `` }
 
   -- first values in the session for screen fields
   ${params.includeScreens ?
-  `, ${ctx.when(global.session.config.warehouse == "bigquery", `struct(\n  `)}
+  `, ${ctx.when(global.dataform.projectConfig.warehouse == "bigquery", `struct(\n  `)}
   ${Object.entries(segmentCommon.allScreenFields(params)).map(
       ([key, value]) => `first_and_last_screen_values.first_${value}`).join(",\n  ")}
-  ${ctx.when(global.session.config.warehouse == "bigquery", `) as first_screen_values`)},
+  ${ctx.when(global.dataform.projectConfig.warehouse == "bigquery", `) as first_screen_values`)},
   -- last values in the session for screen fields
-  ${ctx.when(global.session.config.warehouse == "bigquery", `struct(\n  `)}
+  ${ctx.when(global.dataform.projectConfig.warehouse == "bigquery", `struct(\n  `)}
   ${Object.entries(segmentCommon.allScreenFields(params)).map(
       ([key, value]) => `first_and_last_screen_values.last_${value}`).join(",\n  ")}
-  ${ctx.when(global.session.config.warehouse == "bigquery", `) as last_screen_values`)}` : `` }
+  ${ctx.when(global.dataform.projectConfig.warehouse == "bigquery", `) as last_screen_values`)}` : `` }
 
 
-  ${ctx.when(global.session.config.warehouse == "bigquery", `-- repeated array of records
+  ${ctx.when(global.dataform.projectConfig.warehouse == "bigquery", `-- repeated array of records
   ,array_agg(
     struct(
       segment_sessionized_events.timestamp
@@ -148,7 +148,7 @@ from
   ${params.includeScreens ? 
   `left join first_and_last_screen_values
     using(session_id)` : ``}
-  ${ctx.when(global.session.config.warehouse == "bigquery",
+  ${ctx.when(global.dataform.projectConfig.warehouse == "bigquery",
   segmentCommon.enabledEvents(params).map((event) => 
     `left join ${ctx.ref(params.defaultConfig.schema, `segment_sessionized_${event}s`)} as segment_sessionized_${event}s
     using(${event}_id)`).join(`\n  `))}

package-lock.json

@@ -1,5 +1,5 @@
 {
     "dependencies": {
-        "@dataform/core": "1.6.3"
+        "@dataform/core": "1.13.0"
     }
 }