supporting fields with NULL types as sql NullType

databricks · May 9, 2017 · ddb0dfe · ddb0dfe
1 parent c19f01a
commit ddb0dfe
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/main/scala/com/databricks/spark/avro/SchemaConverters.scala b/src/main/scala/com/databricks/spark/avro/SchemaConverters.scala
@@ -52,6 +52,7 @@ object SchemaConverters {
       case LONG => SchemaType(LongType, nullable = false)
       case FIXED => SchemaType(BinaryType, nullable = false)
       case ENUM => SchemaType(StringType, nullable = false)
+      case NULL => SchemaType(NullType, nullable = false)
 
       case RECORD =>
         val fields = avroSchema.getFields.asScala.map { f =>

diff --git a/src/test/scala/com/databricks/spark/avro/AvroSuite.scala b/src/test/scala/com/databricks/spark/avro/AvroSuite.scala
@@ -109,9 +109,8 @@ class AvroSuite extends FunSuite with BeforeAndAfterAll {
       dataFileWriter.flush()
       dataFileWriter.close()
 
-      intercept[IncompatibleSchemaException] {
-        spark.read.avro(s"$dir.avro")
-      }
+      val df = spark.read.avro(s"$dir.avro")
+      assert(df.count() == 1)
     }
   }