returns empty array for one to many relationships in graph query

featurist · Jun 24, 2017 · 74e25d3 · 74e25d3
1 parent d0d78cf
commit 74e25d3
Show file tree

Hide file tree

Showing 2 changed files with 37 additions and 29 deletions.
diff --git a/index.js b/index.js
@@ -86,22 +86,20 @@ function graphify(definition, rows) {
 
         var foreignEntity = loadEntity(row, foreign)
 
-        if (foreignEntity) {
-          if (foreign.isOneToMany) {
-            var array = entity[field]
-            if (!array) {
-              array = entity[field] = []
-            }
-            var existing = array.find(function (item) {
-              return item.identity() === foreignEntity.identity()
-            })
-            if (!existing) {
-              array.push(foreignEntity)
-            }
-          } else if (!entity[field]) {
-            foreignEntity.setForeignKeyField(false)
-            entity[field] = foreignEntity
+        if (foreign.isOneToMany) {
+          var array = entity[field]
+          if (!array) {
+            array = entity[field] = []
           }
+          var existing = array.find(function (item) {
+            return item.identity() === foreignEntity.identity()
+          })
+          if (foreignEntity && !existing) {
+            array.push(foreignEntity)
+          }
+        } else if (foreignEntity && !entity[field]) {
+          foreignEntity.setForeignKeyField(false)
+          entity[field] = foreignEntity
         }
       })
 

diff --git a/test/describeDatabase.js b/test/describeDatabase.js
@@ -1490,7 +1490,7 @@ module.exports = function(name, config, database, otherTests) {
               var sql = 
                 'select ' +
                 'people.id as person_id, people.name as name, addresses.id as address_id, address, pets.id as pet_id, pets.name as pet_name ' +
-                'from people join addresses on people.address_id = addresses.id ' +
+                'from addresses left join people on people.address_id = addresses.id ' +
                 'left join pets on pets.owner_id = people.id ' +
                 'order by addresses.address, people.name, pets.name'
 
@@ -1516,7 +1516,8 @@ module.exports = function(name, config, database, otherTests) {
                       },
                       {
                         id: jane.id,
-                        name: 'jane'
+                        name: 'jane',
+                        pets: []
                       }
                     ]
                   },
@@ -1542,14 +1543,27 @@ module.exports = function(name, config, database, otherTests) {
           });
 
           it('can rebuild a graph with one to one relationships', function () {
-            var somethingPlace
-            var anotherPlace
-            var bob = person({name: 'bob', address: somethingPlace = address({address: '1 something place'})})
-            var mary = person({name: 'mary', address: anotherPlace = address({address: '2 another place'})})
+            var bob
+
+            var somethingPlace = address({
+              address: '1 something place',
+              people: function (address) {
+                return [
+                  bob = person({
+                    name: 'bob',
+                    address: address
+                  })
+                ]
+              }
+            })
+
+            var anotherPlace = address({
+              address: '2 another place'
+            })
 
             return Promise.all([
-              bob.save(),
-              mary.save()
+              somethingPlace.save(),
+              anotherPlace.save()
             ]).then(function () {
               var def = address({
                 id: 'address_id',
@@ -1563,7 +1577,7 @@ module.exports = function(name, config, database, otherTests) {
               return db.queryGraph(def,
                 'select ' +
                 'people.id as person_id, name, addresses.id as address_id, address ' +
-                'from people join addresses on people.address_id = addresses.id ' +
+                'from addresses left join people on people.address_id = addresses.id ' +
                 'order by addresses.address, people.name'
               ).then(function (results) {
                 expect(clone(results)).to.eql([
@@ -1577,11 +1591,7 @@ module.exports = function(name, config, database, otherTests) {
                   },
                   {
                     id: anotherPlace.id,
-                    address: '2 another place',
-                    people: {
-                      id: mary.id,
-                      name: 'mary'
-                    }
+                    address: '2 another place'
                   }
                 ]);
               })