style fixes during review

Author: SudoBobo

graphql/accessor_general.lua

@@ -646,7 +646,7 @@ local function build_connection_indexes(indexes, collections)
 
                 connection_indexes[c.destination_collection][c.name] =
                 set_connection_index(c, c.name, c.type, collection_name,
-                indexes, connection_indexes)
+                    indexes, connection_indexes)
             end
 
             if c.variants ~= nil then
@@ -655,8 +655,8 @@ local function build_connection_indexes(indexes, collections)
                         connection_indexes[v.destination_collection] = {}
                     end
                     connection_indexes[v.destination_collection][c.name] =
-                    set_connection_index(v, c.name, c.type, collection_name,
-                    indexes, connection_indexes)
+                        set_connection_index(v, c.name, c.type, collection_name,
+                            indexes, connection_indexes)
                 end
             end
         end

graphql/core/rules.lua

@@ -323,6 +323,8 @@ function rules.fragmentSpreadIsPossible(node, context)
   local fragmentTypes = getTypes(fragmentType)
 
   local valid = util.find(parentTypes, function(kind)
+    local kind = kind
+    if kind.__type == 'NonNull' then kind = kind.ofType end
     return fragmentTypes[kind]
   end)
 

graphql/tarantool_graphql.lua

@@ -13,6 +13,8 @@ function utils.show_trace(func, ...)
         function(err)
             log.info('ERROR: ' .. tostring(err))
             log.info(debug.traceback())
+            print('ERROR: ' .. tostring(err))
+            print(debug.traceback())
         end
     ))
 end

graphql/utils.lua

@@ -1,3 +1,24 @@
+RUN 1 {{{
+QUERY
+        query obtainHeroes($hero_id: String) {
+            hero_collection(hero_id: $hero_id) {
+                hero_id
+                hero_type
+                hero_connection {
+                    ... on human_collection {
+                        name
+                    }
+                    ... on starship_collection {
+                        model
+                    }
+                }
+            }
+        }
+VARIABLES
+---
+hero_id: hero_id_1
+...
+
 RESULT
 ---
 hero_collection:
@@ -7,6 +28,29 @@ hero_collection:
   hero_id: hero_id_1
 ...
 
+}}}
+
+RUN 2 {{{
+QUERY
+        query obtainHeroes($hero_id: String) {
+            hero_collection(hero_id: $hero_id) {
+                hero_id
+                hero_type
+                hero_connection {
+                    ... on human_collection {
+                        name
+                    }
+                    ... on starship_collection {
+                        model
+                    }
+                }
+            }
+        }
+VARIABLES
+---
+hero_id: hero_id_2
+...
+
 RESULT
 ---
 hero_collection:
@@ -16,3 +60,5 @@ hero_collection:
   hero_id: hero_id_2
 ...
 
+}}}
+

test-run

@@ -1,9 +1,11 @@
 local json = require('json')
-local yaml = require('yaml')
 local utils = require('graphql.utils')
+local test_utils =  require('test.utils')
 
 local compound_index_testdata = {}
 
+local format_result = test_utils.format_result
+
 -- return an error w/o file name and line number
 local function strip_error(err)
     return tostring(err):gsub('^.-:.-: (.*)$', '%1')
@@ -14,11 +16,6 @@ local function print_and_return(...)
     return table.concat({...}, ' ') .. '\n'
 end
 
-local function format_result(name, query, variables, result)
-    return ('RUN %s {{{\nQUERY\n%s\nVARIABLES\n%s\nRESULT\n%s\n}}}\n'):format(
-        name, query:rstrip(), yaml.encode(variables), yaml.encode(result))
-end
-
 -- schemas and meta-information
 -- ----------------------------
 

test/local/union.result

@@ -1,14 +1,9 @@
 local json = require('json')
-local yaml = require('yaml')
 local utils = require('graphql.utils')
+local test_utils = require('test.utils')
 
 local union_testdata = {}
 
-local function print_and_return(...)
-    print(...)
-    return table.concat({ ... }, ' ') .. '\n'
-end
-
 function union_testdata.get_test_metadata()
     local schemas = json.decode([[{
         "hero": {
@@ -203,15 +198,16 @@ function union_testdata.run_queries(gql_wrapper)
     utils.show_trace(function()
         local variables_1 = {hero_id = 'hero_id_1'}
         local result = gql_query:execute(variables_1)
-        results = results .. print_and_return(
-            ('RESULT\n%s'):format(yaml.encode(result)))
+        results = results .. test_utils.print_and_return(test_utils.format_result(
+        '1', query, variables_1, result))
+
     end)
 
     utils.show_trace(function()
         local variables_2 = {hero_id = 'hero_id_2'}
         local result = gql_query:execute(variables_2)
-        results = results .. print_and_return(
-            ('RESULT\n%s'):format(yaml.encode(result)))
+        results = results .. test_utils.print_and_return(test_utils.format_result(
+        '2', query, variables_2, result))
     end)
 
     return results

test/testdata/compound_index_testdata.lua

@@ -0,0 +1,17 @@
+--- Various utility function used across the graphql module tests.
+
+local yaml = require('yaml')
+
+local utils = {}
+
+function utils.format_result(name, query, variables, result)
+    return ('RUN %s {{{\nQUERY\n%s\nVARIABLES\n%s\nRESULT\n%s\n}}}\n'):format(
+    name, query:rstrip(), yaml.encode(variables), yaml.encode(result))
+end
+
+function utils.print_and_return(...)
+    print(...)
+    return table.concat({ ... }, ' ') .. '\n'
+end
+
+return utils