emeraldjava
diff --git a/‎src/main/java/graphql/schema/idl/TypeDefinitionRegistry.java‎
Lines changed: 5 additions & 1 deletion b/‎src/main/java/graphql/schema/idl/TypeDefinitionRegistry.java‎
Lines changed: 5 additions & 1 deletion
diff --git a/‎src/test/groovy/graphql/schema/idl/TypeDefinitionRegistryTest.groovy‎
Lines changed: 23 additions & 0 deletions b/‎src/test/groovy/graphql/schema/idl/TypeDefinitionRegistryTest.groovy‎
Lines changed: 23 additions & 0 deletions
@@ -57,8 +57,12 @@ public TypeDefinitionRegistry merge(TypeDefinitionRegistry typeRegistry) throws
             throw new SchemaProblem(errors);
         }
 
+        if (this.schema == null) {
+            // ensure schema is not overwritten by merge
+            this.schema = typeRegistry.schema;
+        }
+
         // ok commit to the merge
-        this.schema = typeRegistry.schema;
         this.types.putAll(tempTypes);
         this.scalarTypes.putAll(tempScalarTypes);
         //
 
@@ -45,6 +45,29 @@ class TypeDefinitionRegistryTest extends Specification {
     }
 
 
+    def "merging multiple type registries does not overwrite schema definition"() {
+
+        def spec1 = """ 
+            schema {
+                query: Query
+            }
+        """
+
+        def spec2 = """ 
+            type Post { id: Int! }
+        """
+
+        def result1 = compile(spec1)
+        def result2 = compile(spec2)
+
+        def registry = result1.merge(result2)
+
+        expect:
+        result1.schemaDefinition().isPresent()
+        registry.schemaDefinition().get().isEqualTo(result1.schemaDefinition().get())
+
+    }
+
     def "test merge of schema types"() {
 
         def spec1 = """