From d45b35001399262d0880502254e79403d2c5abfe Mon Sep 17 00:00:00 2001
From: Alexandre Bodin <bodin.alex@gmail.com>
Date: Mon, 23 Dec 2019 10:45:34 +0100
Subject: [PATCH] Add morph rel on populate compo relation

---
 .../strapi-connector-bookshelf/lib/populate.js  | 17 +++++++++++++++--
 1 file changed, 15 insertions(+), 2 deletions(-)

diff --git a/packages/strapi-connector-bookshelf/lib/populate.js b/packages/strapi-connector-bookshelf/lib/populate.js
index b57310468f..0fabee5b39 100644
--- a/packages/strapi-connector-bookshelf/lib/populate.js
+++ b/packages/strapi-connector-bookshelf/lib/populate.js
@@ -54,8 +54,21 @@ const populateBareAssociations = (definition, { prefix = '' } = {}) => {
         });
       }
 
-      return `${prefix}${assoc.alias}`;
-    });
+      const path = `${prefix}${assoc.alias}`;
+      const assocModel = findModelByAssoc({ assoc });
+
+      const polyAssocs = assocModel.associations
+        .filter(assoc => isPolymorphic({ assoc }))
+        .map(assoc =>
+          formatPolymorphicPopulate({
+            assoc,
+            prefix: `${path}.`,
+          })
+        );
+
+      return [path, ...polyAssocs];
+    })
+    .reduce((acc, val) => acc.concat(val), []);
 };
 
 const formatAssociationPopulate = ({ assoc, prefix = '' }) => {