diff --git a/crates/apollo-compiler/src/database/hir.rs b/crates/apollo-compiler/src/database/hir.rs
index 49cfff65b..1d5b93d5a 100644
--- a/crates/apollo-compiler/src/database/hir.rs
+++ b/crates/apollo-compiler/src/database/hir.rs
@@ -3568,6 +3568,20 @@ mod tests {
         assert!(!union_.has_member("Enum"));
     }
 
+    #[test]
+    fn query_extended_type() {
+        let mut compiler = ApolloCompiler::new();
+        compiler.add_type_system("type Query { foo: String }", "base.graphql");
+        compiler.add_type_system("extend type Query { bar: Int }", "ext.graphql");
+        compiler.add_executable("{ bar }", "query.graphql");
+        let operations = compiler.db.all_operations();
+        let fields = operations[0].fields(&compiler.db);
+        // This unwrap failed before https://github.com/apollographql/apollo-rs/pull/482
+        // changed the behavior of `ObjectTypeDefinition::field(name)` in `hir_db::parent_ty`
+        let ty = fields[0].ty(&compiler.db).unwrap();
+        assert_eq!(ty.name(), "Int");
+    }
+
     #[test]
     fn syntax_errors() {
         let mut compiler = ApolloCompiler::new();