fix(query): not found relationship are null or empty array (#19)

* fix(query): not found relationship are null or empty array

Author: gjuchault

lib/model/parse.js

@@ -11,7 +11,8 @@ const debug = require('debug')('requelize:model:parse')
  */
 module.exports = (obj, opts, Model, requelize) => {
   if (!obj) {
-    return
+    // return null if null, undefined if undefined
+    return obj
   }
 
   if (Array.isArray(obj)) {

lib/model/query/belongsTo.js

@@ -23,7 +23,7 @@ module.exports = function (Query, requelize, Model, join, tree, key) {
   )
 
   return function (doc) {
-    const q = relTable.get(doc(join.localKey))
+    const q = relTable.get(doc(join.localKey)).default(null)
 
     let embedQuery = new Query(q, RelModel, requelize)
 

lib/model/query/belongsToMany.js

@@ -44,6 +44,7 @@ module.exports = function (Query, requelize, Model, join, tree, key) {
       })
       ._query
       .coerceTo('array')
+      .default([])
 
     let embedQuery = new Query(q, RelModel, requelize)
 

lib/model/query/hasMany.js

@@ -27,6 +27,7 @@ module.exports = function (Query, requelize, Model, join, tree, key) {
     const q = relTable
       .getAll(doc(selfPk), { index: join.foreignKey })
       .coerceTo('array')
+      .default([])
 
     let embedQuery = new Query(q, RelModel, requelize)
 

package.json

@@ -1,6 +1,6 @@
 {
   "name": "requelize",
-  "version": "0.7.1",
+  "version": "0.7.2",
   "description": "RethinkDB ORM",
   "main": "index.js",
   "repository": "https://github.com/buckless/requelize.git",

test/test.unknownRelation.js

@@ -0,0 +1,158 @@
+const Joi = require('joi')
+const { test, requelize, dropDb } = require('./utils')
+
+test('unknown relation - hasOne', (t) => {
+  t.plan(1)
+
+  let Foo
+  let Bar
+  let foo
+
+  dropDb()
+    .then(() => {
+      Foo = requelize.model('foo', {
+        name: Joi.string()
+      })
+
+      Bar = requelize.model('bar')
+
+      Foo.hasOne('bar', 'bar')
+      Bar.belongsTo('foo', 'foo')
+
+      return requelize.sync()
+    })
+    .then(() => {
+      foo = new Foo({ name: 'foo' })
+
+      return foo.save()
+    })
+    .then((res) => {
+      return Foo.embed({ bar: true })
+    })
+    .then((res) => {
+      t.equal(null, res[0].bar, 'hasOne relation is null when not found')
+    })
+    .catch((err) => {
+      t.fail(err)
+    })
+    .then(() => {
+      t.end()
+    })
+})
+
+test('unknown relation - belongsTo', (t) => {
+  t.plan(1)
+
+  let Foo
+  let Bar
+  let bar
+
+  dropDb()
+    .then(() => {
+      Foo = requelize.model('foo', {
+        name: Joi.string()
+      })
+
+      Bar = requelize.model('bar')
+
+      Foo.hasOne('bar', 'bar')
+      Bar.belongsTo('foo', 'foo')
+
+      return requelize.sync()
+    })
+    .then(() => {
+      bar = new Bar({ name: 'bar' })
+
+      return bar.save()
+    })
+    .then((res) => {
+      return Bar.embed({ foo: true })
+    })
+    .then((res) => {
+      t.equal(null, res[0].foo, 'belongsTo relation is null when not found')
+    })
+    .catch((err) => {
+      t.fail(err)
+    })
+    .then(() => {
+      t.end()
+    })
+})
+
+test('unknown relation - hasMany', (t) => {
+  t.plan(1)
+
+  let Foo
+  let Bar
+  let foo
+
+  dropDb()
+    .then(() => {
+      Foo = requelize.model('foo', {
+        name: Joi.string()
+      })
+
+      Bar = requelize.model('bar')
+
+      Foo.hasMany('bar', 'bars')
+      Bar.belongsTo('foo', 'foo')
+
+      return requelize.sync()
+    })
+    .then(() => {
+      foo = new Foo({ name: 'foo' })
+
+      return foo.save()
+    })
+    .then((res) => {
+      return Foo.embed({ bars: true })
+    })
+    .then((res) => {
+      t.equal(0, res[0].bars.length, 'hasMany relation is empty array when not found')
+    })
+    .catch((err) => {
+      t.fail(err)
+    })
+    .then(() => {
+      t.end()
+    })
+})
+
+test('unknown relation - belongsToMany', (t) => {
+  t.plan(1)
+
+  let Foo
+  let Bar
+  let foo
+
+  dropDb()
+    .then(() => {
+      Foo = requelize.model('foo', {
+        name: Joi.string()
+      })
+
+      Bar = requelize.model('bar')
+
+      Foo.belongsToMany('bar', 'bars')
+      Bar.belongsToMany('foo', 'foo')
+
+      return requelize.sync()
+    })
+    .then(() => {
+      foo = new Foo({ name: 'foo' })
+
+      return foo.save()
+    })
+    .then((res) => {
+      return Foo.embed({ bars: true })
+    })
+    .then((res) => {
+      t.equal(0, res[0].bars.length, 'hasMany relation is empty array when not found')
+    })
+    .catch((err) => {
+      t.fail(err)
+    })
+    .then(() => {
+      t.end()
+    })
+})