From bd1816a34c990e6b7fbafb6c68bab6e95453bccf Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Mon, 13 Dec 2021 11:37:58 +0530
Subject: [PATCH] fix: handle wrong nested relation param values

re #856

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../lib/dataMapper/lib/sql/BaseModelSql.ts    | 60 ++++++++++++-------
 1 file changed, 37 insertions(+), 23 deletions(-)

diff --git a/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts b/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts
index 409f6ea101..28a0931b9a 100644
--- a/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts
+++ b/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts
@@ -1266,7 +1266,10 @@ class BaseModelSql extends BaseModel {
     );
     let { fields } = restArgs;
     const { cn } = this.hasManyRelations.find(({ tn }) => tn === child) || {};
-    const _cn = this.dbModels[child].columnToAlias?.[cn];
+    if (!this.dbModels[child]) {
+      return;
+    }
+    const _cn = this.dbModels[child]?.columnToAlias?.[cn];
 
     if (fields !== '*' && fields.split(',').indexOf(cn) === -1) {
       fields += ',' + cn;
@@ -1345,6 +1348,10 @@ class BaseModelSql extends BaseModel {
       fields += ',' + cn;
     }
 
+    if (!this.dbModels[child]) {
+      return;
+    }
+
     const childs = await this._run(
       driver.union(
         parentIds.map(id => {
@@ -1498,13 +1505,17 @@ class BaseModelSql extends BaseModel {
         fields += ',' + this.pks[0].cn;
       }
 
-      for (const parent of parents.split(',')) {
-        const { cn } =
-          this.belongsToRelations.find(({ rtn }) => rtn === parent) || {};
-        if (fields !== '*' && fields.split(',').indexOf(cn) === -1) {
-          fields += ',' + cn;
+      if (parents)
+        for (const parent of parents.split(',')) {
+          if (!parent) {
+            continue;
+          }
+          const { cn } =
+            this.belongsToRelations.find(({ rtn }) => rtn === parent) || {};
+          if (fields !== '*' && fields.split(',').indexOf(cn) === -1) {
+            fields += ',' + cn;
+          }
         }
-      }
 
       const items = await this.list({ childs, where, fields, ...rest });
 
@@ -1525,22 +1536,23 @@ class BaseModelSql extends BaseModel {
         );
       }
 
-      await Promise.all(
-        parents.split(',').map((parent, index): any => {
-          if (!parent) {
-            return;
-          }
-          const { cn, rcn } =
-            this.belongsToRelations.find(({ rtn }) => rtn === parent) || {};
-          const parentIds = [
-            ...new Set(items.map(c => c[cn] || c[this.columnToAlias[cn]]))
-          ];
-          return this._belongsTo(
-            { parent, rcn, parentIds, childs: items, cn, ...rest },
-            index
-          );
-        })
-      );
+      if (parents)
+        await Promise.all(
+          parents.split(',').map((parent, index): any => {
+            if (!parent) {
+              return;
+            }
+            const { cn, rcn } =
+              this.belongsToRelations.find(({ rtn }) => rtn === parent) || {};
+            const parentIds = [
+              ...new Set(items.map(c => c[cn] || c[this.columnToAlias[cn]]))
+            ];
+            return this._belongsTo(
+              { parent, rcn, parentIds, childs: items, cn, ...rest },
+              index
+            );
+          })
+        );
 
       if (items && items.length) {
         await Promise.all(
@@ -1945,6 +1957,8 @@ class BaseModelSql extends BaseModel {
       fields += ',' + rcn;
     }
 
+    if (!this.dbModels[parent]) return;
+
     const parents = await this._run(
       driver(this.dbModels[parent].tnPath)
         // .select(...fields.split(',')