fix bug with junctions in a batch after a union type. fix null checki…

…ng bug in the batch planner
gamingexperience · Sep 1, 2017 · 23fd7ea · 23fd7ea
1 parent b726e53
commit 23fd7ea
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "join-monster",
-  "version": "2.0.10",
+  "version": "2.0.11",
   "description": "A GraphQL to SQL query execution layer for batch data fetching.",
   "main": "dist/index.js",
   "engines": {

diff --git a/src/batch-planner/index.js b/src/batch-planner/index.js
@@ -17,7 +17,7 @@ export default async function nextBatch(sqlAST, data, dbCall, context, options)
   }
 
   const children = sqlAST.children
-  children.push(...Object.values(sqlAST.typedChildren || {}))
+  Object.values(sqlAST.typedChildren || {}).forEach(typedChildren => children.push(...typedChildren))
 
   // loop through all the child fields that are tables
   return Promise.all(children.map(async childAST => {
@@ -75,7 +75,7 @@ export default async function nextBatch(sqlAST, data, dbCall, context, options)
         }
 
         // move down a level and recurse
-        const nextLevelData = chain(data).filter(obj => obj !== null).flatMap(obj => obj[fieldName]).value()
+        const nextLevelData = chain(data).filter(obj => obj != null).flatMap(obj => obj[fieldName]).value()
         return nextBatch(childAST, nextLevelData, dbCall, context, options)
       }
       const batchScope = [ maybeQuote(data[parentKey]) ]
@@ -97,7 +97,7 @@ export default async function nextBatch(sqlAST, data, dbCall, context, options)
 
     // otherwise, just bypass this and recurse down to the next level
     } else if (Array.isArray(data)) {
-      const nextLevelData = chain(data).filter(obj => obj !== null).flatMap(obj => obj[fieldName]).value()
+      const nextLevelData = chain(data).filter(obj => obj != null).flatMap(obj => obj[fieldName]).value()
       return nextBatch(childAST, nextLevelData, dbCall, context, options)
     } else if (data) {
       return nextBatch(childAST, data[fieldName], dbCall, context, options)

diff --git a/src/define-object-shape.js b/src/define-object-shape.js
@@ -69,6 +69,9 @@ function _defineObjectShape(parent, prefix, node) {
       case 'table':
         if (child.sqlBatch) {
           fieldDefinition[child.sqlBatch.parentKey.fieldName + suffix] = prefixToPass + child.sqlBatch.parentKey.as
+        } else if (idx(child, _ => _.junction.sqlBatch)) {
+          fieldDefinition[child.junction.sqlBatch.parentKey.fieldName + suffix] =
+            prefixToPass + child.junction.sqlBatch.parentKey.as
         } else {
           const definition = _defineObjectShape(node, prefixToPass, child)
           fieldDefinition[child.fieldName + suffix] = definition