Fix parquet schema type in registry

indix · Dec 1, 2017 · 7af173f · 7af173f
1 parent 7074ad0
commit 7af173f
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 16 deletions.
diff --git a/build.sbt b/build.sbt
@@ -52,19 +52,21 @@ lazy val schemer = Project(
   base = file(".")
 ) aggregate (core, registry)
 
-lazy val core = (project in file("schemer-core")).settings(
-  inThisBuild(
-    List(
-      organization := "com.indix",
-      scalaVersion := "2.11.11",
-      crossScalaVersions := Seq("2.11.11"),
-      version := libVersion,
-      scalafmtOnCompile := true
-    )
-  ),
-  name := "schemer-core",
-  libraryDependencies ++= sparkStackProvided ++ Seq(jsonSchemaValidator, scalaTest)
-).settings(publishSettings: _*)
+lazy val core = (project in file("schemer-core"))
+  .settings(
+    inThisBuild(
+      List(
+        organization := "com.indix",
+        scalaVersion := "2.11.11",
+        crossScalaVersions := Seq("2.11.11"),
+        version := libVersion,
+        scalafmtOnCompile := true
+      )
+    ),
+    name := "schemer-core",
+    libraryDependencies ++= sparkStackProvided ++ Seq(jsonSchemaValidator, scalaTest)
+  )
+  .settings(publishSettings: _*)
 
 lazy val registry = (project in file("schemer-registry"))
   .enablePlugins(BuildInfoPlugin)
@@ -85,7 +87,7 @@ lazy val registry = (project in file("schemer-registry"))
         organization := "com.indix",
         scalaVersion := "2.11.11",
         version := libVersion,
-        scalafmtOnCompile := true,
+        scalafmtOnCompile := true
       )
     ),
     name := "schemer-registry",

diff --git a/schemer-registry/src/main/scala/schemer/registry/graphql/schema/InferType.scala b/schemer-registry/src/main/scala/schemer/registry/graphql/schema/InferType.scala
@@ -1,12 +1,12 @@
 package schemer.registry.graphql.schema
 
 import sangria.schema._
-import schemer._
 import schemer.registry.graphql.schema.SchemaDefinition.constantComplexity
 import sangria.macros.derive.{deriveInputObjectType, deriveObjectType, InputObjectTypeName}
 import schemer.registry.graphql._
 import spray.json.DefaultJsonProtocol
 import sangria.marshalling.sprayJson._
+import schemer._
 
 trait InferType extends DefaultJsonProtocol {
   lazy implicit val TypeArg             = Argument("type", StringType)
@@ -82,7 +82,7 @@ trait InferType extends DefaultJsonProtocol {
         StringType,
         description = Some("Parquet Schema type"),
         complexity = constantComplexity(10),
-        resolve = ctx => ctx.value.`type`
+        resolve = ctx => ctx.value.`type`.`type`
       ),
       Field(
         "schema",