Merge ae4521d into 39f3eb1

snowplow-incubator · Nov 10, 2020 · 44272a8 · 44272a8
2 parents 39f3eb1 + ae4521d
commit 44272a8
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,8 @@
+Version 0.1.1 (2020-11-10)
+--------------------------
+Add support for nullable fields (#6)
+Bump Analytics SDK to 2.1.0 (#8)
+
 Version 0.1.0 (2020-10-05)
 --------------------------
 Initial release
diff --git a/...s/common/src/main/scala/com/snowplowanalytics/snowplow/postgres/shredding/transform.scala b/...s/common/src/main/scala/com/snowplowanalytics/snowplow/postgres/shredding/transform.scala
@@ -185,7 +185,7 @@ object transform {
 
   def cast(json: Option[Json], dataType: Type): Either[String, Option[Value]] = {
     val error = s"Invalid type ${dataType.ddl} for value $json".asLeft[Option[Value]]
-    json match {
+    json.filterNot(_.isNull) match {
       case Some(j) =>
         dataType match {
           case Type.Uuid =>

diff --git a/...es/common/src/test/scala/com/snowplowanalytics/snowplow/postgres/streaming/sinkspec.scala b/...es/common/src/test/scala/com/snowplowanalytics/snowplow/postgres/streaming/sinkspec.scala
@@ -62,7 +62,7 @@ class sinkspec extends Database {
     }
 
     "sink a single self-describing JSON" >> {
-      val row = json"""{"schema":"iglu:com.getvero/bounced/jsonschema/1-0-0","data":{"bounce_type":"one"}}"""
+      val row = json"""{"schema":"iglu:com.getvero/bounced/jsonschema/1-0-0","data":{"bounce_type":"one","bounce_code":null}}"""
       val json = SelfDescribingData.parse(row).getOrElse(throw new RuntimeException("Invalid SelfDescribingData"))
       val stream = Stream.emit[IO, Data](Data.SelfDescribing(json))
 

diff --git a/project/BuildSettings.scala b/project/BuildSettings.scala
@@ -33,7 +33,7 @@ object BuildSettings {
 
   lazy val projectSettings = Seq(
     organization := "com.snowplowanalytics",
-    version := "0.1.0",
+    version := "0.1.1",
     scalaVersion := scala213,
     crossScalaVersions := Seq(scala212, scala213),
     description := "Loading Snowplow enriched data into PostgreSQL in real-time",

diff --git a/project/Dependencies.scala b/project/Dependencies.scala
@@ -33,7 +33,7 @@ object Dependencies {
     val fs2          = "2.4.4"
     val log4s        = "1.8.2"
 
-    val analyticsSdk = "2.0.1"
+    val analyticsSdk = "2.1.0"
     val badRows      = "2.1.0"
     val schemaDdl    = "0.11.0"