From 568347b19d63ecf306c6f38df6708af9b1187afc Mon Sep 17 00:00:00 2001
From: Nick Schot <nickschot@gmail.com>
Date: Mon, 4 Jun 2018 16:33:27 +0200
Subject: [PATCH] fix: falsy IDs breaking relationships

---
 src/packages/database/query/runner/utils/build-results.js | 2 +-
 src/packages/serializer/index.js                          | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/packages/database/query/runner/utils/build-results.js b/src/packages/database/query/runner/utils/build-results.js
index 6db66fd1..ae65915f 100644
--- a/src/packages/database/query/runner/utils/build-results.js
+++ b/src/packages/database/query/runner/utils/build-results.js
@@ -108,7 +108,7 @@ export default async function buildResults<T: Model>({
         .reduce((r, entry) => {
           let [key, value] = entry;
 
-          if (!value && pkPattern.test(key)) {
+          if (value == null && pkPattern.test(key)) {
             return r;
           } else if (key.indexOf('.') >= 0) {
             const [a, b] = key.split('.');
diff --git a/src/packages/serializer/index.js b/src/packages/serializer/index.js
index 245f44eb..096c566c 100644
--- a/src/packages/serializer/index.js
+++ b/src/packages/serializer/index.js
@@ -616,7 +616,7 @@ class Serializer<T: Model> {
                   })
                 )
               };
-            } else if (related && related.id) {
+            } else if (related && related.id != null) {
               return this.formatRelationship({
                 domain,
                 included,