Merge pull request #1119 from asteinwedel/oneOf-input-obj

Support oneOf directive on input objects
sangria-graphql · Jul 22, 2024 · 65a6c5e · 65a6c5e
2 parents 2f58bba + d0fa516
commit 65a6c5e
Show file tree

Hide file tree

Showing 22 changed files with 965 additions and 231 deletions.
diff --git a/build.sbt b/build.sbt
@@ -195,7 +195,21 @@ lazy val core = project
       ProblemFilters.exclude[IncompatibleResultTypeProblem](
         "sangria.schema.WithInputTypeRendering.deprecationTracker"),
       ProblemFilters.exclude[ReversedMissingMethodProblem](
-        "sangria.schema.WithInputTypeRendering.deprecationTracker")
+        "sangria.schema.WithInputTypeRendering.deprecationTracker"),
+      ProblemFilters.exclude[DirectMissingMethodProblem](
+        "sangria.validation.RuleBasedQueryValidator.validateInputDocument"),
+      ProblemFilters.exclude[DirectMissingMethodProblem](
+        "sangria.validation.RuleBasedQueryValidator.validateInputDocument"),
+      ProblemFilters.exclude[DirectMissingMethodProblem](
+        "sangria.schema.SchemaChange#AbstractAstDirectiveAdded.this"),
+      ProblemFilters.exclude[DirectMissingMethodProblem](
+        "sangria.schema.SchemaChange#InputObjectTypeAstDirectiveAdded.copy"),
+      ProblemFilters.exclude[DirectMissingMethodProblem](
+        "sangria.schema.SchemaChange#InputObjectTypeAstDirectiveAdded.this"),
+      ProblemFilters.exclude[MissingTypesProblem](
+        "sangria.schema.SchemaChange$InputObjectTypeAstDirectiveAdded$"),
+      ProblemFilters.exclude[DirectMissingMethodProblem](
+        "sangria.schema.SchemaChange#InputObjectTypeAstDirectiveAdded.apply")
     ),
     Test / testOptions += Tests.Argument(TestFrameworks.ScalaTest, "-oF"),
     libraryDependencies ++= Seq(

diff --git a/.../benchmarks/src/main/scala/sangria/benchmarks/OverlappingFieldsCanBeMergedBenchmark.scala b/.../benchmarks/src/main/scala/sangria/benchmarks/OverlappingFieldsCanBeMergedBenchmark.scala
@@ -98,7 +98,7 @@ class OverlappingFieldsCanBeMergedBenchmark {
     bh.consume(doValidate(validator, deepAbstractConcrete))
 
   private def doValidate(validator: QueryValidator, document: Document): Vector[Violation] = {
-    val result = validator.validateQuery(schema, document, None)
+    val result = validator.validateQuery(schema, document, Map.empty, None)
     require(result.isEmpty)
     result
   }