From 8d86348fe4f1281381f849d5b0e7d1ecb42a0718 Mon Sep 17 00:00:00 2001
From: Pranav C <pranavxc@gmail.com>
Date: Tue, 28 Mar 2023 15:55:22 +0530
Subject: [PATCH] fix: corrections

Signed-off-by: Pranav C <pranavxc@gmail.com>
---
 .../sql-data-mapper/lib/sql/BaseModelSqlv2.ts |  8 +++----
 .../sql-data-mapper/lib/sql/helpers/getAst.ts | 21 ++++++++++++-------
 2 files changed, 17 insertions(+), 12 deletions(-)

diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts
index b11540acd4..f4000319fa 100644
--- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts
+++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts
@@ -3,16 +3,17 @@ import groupBy from 'lodash/groupBy';
 import DataLoader from 'dataloader';
 import {
   AuditOperationSubTypes,
-  AuditOperationTypes,
+  AuditOperationTypes, isSystemColumn,
   isVirtualCol,
   RelationTypes,
   UITypes,
   ViewTypes,
-} from 'nocodb-sdk';
+} from 'nocodb-sdk'
 import ejs from 'ejs';
 import Validator from 'validator';
 import { customAlphabet } from 'nanoid';
 import DOMPurify from 'isomorphic-dompurify';
+import { GridViewColumn } from '../../../../models'
 import Model from '../../../../models/Model';
 import Column from '../../../../models/Column';
 import Filter, {
@@ -1451,7 +1452,6 @@ class BaseModelSqlv2 {
   //  add option to get only pk and pv
   public async selectObject({
     qb,
-    columns: _columns,,
     columns: _columns,
     fields: _fields,
     extractPkAndPv,
@@ -1469,7 +1469,7 @@ class BaseModelSqlv2 {
     const res = {};
     // const columns = _columns ?? (await this.model.getColumns());
     // for (const column of columns) {
-    const viewOrTableColumns = viewColumns || (await this.model.getColumns());
+    const viewOrTableColumns = _columns || viewColumns || (await this.model.getColumns());
     for (const viewOrTableColumn of viewOrTableColumns) {
       const column =
         viewOrTableColumn instanceof Column
diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts
index 813d296b9f..ec32885b5e 100644
--- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts
+++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/helpers/getAst.ts
@@ -1,7 +1,11 @@
-import { isSystemColumn, UITypes } from 'nocodb-sdk';
-import View from '../../../../../models/View';
-import type Model from '../../../../../models/Model';
-import type LinkToAnotherRecordColumn from '../../../../../models/LinkToAnotherRecordColumn';
+import { isSystemColumn, RelationTypes, UITypes } from 'nocodb-sdk';
+import { View } from '../../../../../models';
+import type {
+  Column,
+  LinkToAnotherRecordColumn,
+  LookupColumn,
+  Model,
+} from '../../../../../models';
 
 const getAst = async ({
   query,
@@ -34,7 +38,8 @@ const getAst = async ({
     await Promise.all(
       model.primaryKeys.map((c) => extractDependencies(c, dependencyFields))
     );
-    await extractDependencies(model.primaryValue, dependencyFields);
+
+    await extractDependencies(model.displayValue, dependencyFields);
 
     return { ast, dependencyFields };
   }
@@ -94,11 +99,11 @@ const getAst = async ({
         model,
         query: query?.nested?.[col.title],
         extractOnlyPrimaries: nestedFields !== '*',
-        dependencyFields:(dependencyFields.nested[col.title] =
-        dependencyFields.nested[col.title] || {
+        dependencyFields: (dependencyFields.nested[col.title] = dependencyFields
+          .nested[col.title] || {
           nested: {},
           fields: new Set(),
-        })
+        }),
       });
     }