From da45cc38a5ddebc4ef7b32ee80c5d32368abbac8 Mon Sep 17 00:00:00 2001
From: Vijay Kumar Rathore <professional.vijay8492@gmail.com>
Date: Mon, 21 Mar 2022 15:14:02 +0100
Subject: [PATCH] correct audit logs when primary key is not id column

Signed-off-by: Vijay Kumar Rathore <professional.vijay8492@gmail.com>
---
 packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts b/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts
index 1723b1ed58..ff2d9aa546 100644
--- a/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts
+++ b/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts
@@ -309,12 +309,13 @@ class BaseModelSql extends BaseModel {
           response = data;
         }
       } else if (ai) {
-        response = await this.nestedRead(
+        const nestedResponse = await this.nestedRead(
           Array.isArray(response)
             ? response?.[0]?.[ai._cn]
             : response?.[ai._cn],
           this.defaultNestedBtQueryParams
         );
+        response = !_.isEmpty(nestedResponse) ? nestedResponse : response;
       }
 
       if (Array.isArray(response)) {