fix(relations): relation parser set nested relations on demand

adonisjs · Aug 16, 2017 · 48bdbba · 48bdbba
1 parent 713b55f
commit 48bdbba
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git a/src/Lucid/Relations/Parser.js b/src/Lucid/Relations/Parser.js
@@ -41,7 +41,10 @@ class RelationParser {
        */
       if (existingRelation) {
         existingRelation.callback = parsedRelation.callback
-        _.each(parsedRelation.nested, (v, k) => (existingRelation.nested[k] = v))
+        _.each(parsedRelation.nested, (v, k) => {
+          existingRelation.nested = existingRelation.nested || {}
+          existingRelation.nested[k] = v
+        })
         return result
       }
 

diff --git a/test/unit/relations-parser.spec.js b/test/unit/relations-parser.spec.js
@@ -51,6 +51,11 @@ test.group('Relations Parser', () => {
     assert.deepEqual(parsed, { posts: { name: 'posts', callback: null, nested: { comments: null, likes: null } } })
   })
 
+  test('parse multiple nested relations when first relation doesn\t have nesting', (assert) => {
+    const parsed = RelationsParser.parseRelations({ 'posts': null, 'posts.comments': null, 'posts.likes': null })
+    assert.deepEqual(parsed, { posts: { name: 'posts', callback: null, nested: { comments: null, likes: null } } })
+  })
+
   test('parse multiple nested relations with callback', (assert) => {
     const fn = function () {}
     const parsed = RelationsParser.parseRelations({ 'posts.comments': null, 'posts.likes': null, posts: fn })