From 1e76a963633672754760d298c4258152708d9249 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 10 May 2023 16:18:02 +0800
Subject: [PATCH] fix(nocodb): convertDateFormat logic

---
 packages/nocodb/src/db/BaseModelSqlv2.ts | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts
index d35f345011..97e740a31b 100644
--- a/packages/nocodb/src/db/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/db/BaseModelSqlv2.ts
@@ -3170,7 +3170,8 @@ class BaseModelSqlv2 {
     data = this.convertAttachmentType(data, childTable);
 
     // update date time fields
-    data = this.convertDateFormat(data, childTable);
+    const isXcdbBase = await this.isXcdbBase();
+    data = this.convertDateFormat(data, isXcdbBase, childTable);
 
     return data;
   }
@@ -3231,10 +3232,14 @@ class BaseModelSqlv2 {
     return d;
   }
 
-  private convertDateFormat(data: Record<string, any>, childTable?: Model) {
+  private convertDateFormat(
+    data: Record<string, any>,
+    isXcdbBase: BoolType,
+    childTable?: Model,
+  ) {
     // Show the date time in UTC format in API response
     // e.g. 2022-01-01 04:30:00+00:00
-    if (data) {
+    if (isXcdbBase && data) {
       const dateTimeColumns = (
         childTable ? childTable.columns : this.model.columns
       ).filter((c) => c.uidt === UITypes.DateTime);