fix: error when only ask for __typename

fasibio · Jul 25, 2023 · e7acd7f · e7acd7f
1 parent 8fa927f
commit e7acd7f
Show file tree

Hide file tree

Showing 6 changed files with 87 additions and 6 deletions.
diff --git a/generate_code_resolver.go.tpl b/generate_code_resolver.go.tpl
@@ -65,7 +65,10 @@
           }
           var res []*model.{{$object.Name}}
           tableName := r.Sql.Db.Config.NamingStrategy.TableName("{{$object.Name}}")
-          db = runtimehelper.GetPreloadSelection(ctx, db,runtimehelper.GetPreloadsMap(ctx, "data").SubTables[0])
+          preloadSubTables := runtimehelper.GetPreloadsMap(ctx, "data").SubTables
+          if len(preloadSubTables)> 0{
+            db = runtimehelper.GetPreloadSelection(ctx, db,runtimehelper.GetPreloadsMap(ctx, "data").SubTables[0])
+          }
           if filter != nil{
             blackList := make(map[string]struct{})
             sql, arguments := runtimehelper.CombineSimpleQuery(filter.ExtendsDatabaseQuery(db, fmt.Sprintf("%[1]s%[2]s%[1]s",runtimehelper.GetQuoteChar(db), tableName), false, blackList), "AND")

diff --git a/integration/__snapshots__/generated_test.snap b/integration/__snapshots__/generated_test.snap
@@ -10033,3 +10033,11 @@ gqlerror.List{
     },
 }
 ---
+
+[TestQueryTestSuite/TestComplexCombination/no_data_query - 1]
+&integration.noDataQueryResponse{
+    QueryUser: &integration.noDataQueryQueryUserUserQueryResult{
+        Typename: &"UserQueryResult",
+    },
+}
+---
diff --git a/integration/generated.go b/integration/generated.go
diff --git a/integration/generated_test.go b/integration/generated_test.go
@@ -278,6 +278,10 @@ func (suite *QueryTestSuite) TestComplexCombination() {
 		return getAllTodosWithUserGroupById(context.Background(), suite.Client)
 	}))
 
+	suite.T().Run("no data query", queryTester(func() (any, error) {
+		return noDataQuery(context.Background(), suite.Client)
+	}))
+
 	suite.T().Run("allTodosPartOfCompany => TestCompany2", queryTester(func() (any, error) {
 		companyName := "TestCompany2"
 		return allTodosPartOfCompany(context.Background(), suite.Client, &companyName)

diff --git a/integration/genqlient.graphql b/integration/genqlient.graphql
@@ -240,6 +240,12 @@ query allUserWithACatOnlyUserId{
   }
 }
 
+query noDataQuery{
+  queryUser(filter:{cat:{userID: {notNull:true}}}){
+    __typename
+  }
+}
+
 query allTodosPartOfCompany($companyName:String){
   queryTodo(filter: { users:{company: {name: {eq: $companyName}}}}, order:{desc:id}){
     data{
@@ -297,6 +303,7 @@ query getAllTodosWithUserGroupById{
   }
 }
 
+
 query getUserById($userId:ID!){
   getUser(id:$userId){
     id

diff --git a/testservice/graph/autogql.resolvers.go b/testservice/graph/autogql.resolvers.go