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 c37bf83e1e..89f9805255 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 @@ -201,7 +201,8 @@ class BaseModelSqlv2 { sort?: string | string[]; fieldsSet?: Set; } = {}, - ignoreViewFilterAndSort = false + ignoreViewFilterAndSort = false, + ): Promise { const { where, fields, ...rest } = this._getListArgs(args as any); @@ -286,6 +287,8 @@ class BaseModelSqlv2 { if (!ignoreViewFilterAndSort) applyPaginate(innerQb, rest); const proto = await this.getProto(); + console.log(wrapperQb.toQuery()) + const data = await this.execAndParse(wrapperQb); return data?.map((d) => { diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts index b859b8ac66..edf1da8221 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/formulav2/formulaQueryBuilderv2.ts @@ -821,7 +821,7 @@ export default async function formulaQueryBuilderv2( model: Model, column?: Column, aliasToColumn = {}, - tableAlias?: string + tableAlias?: string, ) { // register jsep curly hook once only jsep.plugins.register(jsepCurlyHook); 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 7a48172e65..6aac66c2f3 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 @@ -14,6 +14,7 @@ const getAst = async ({ model, view, dependencyFields = { + ...(query || {}), nested: { ...(query?.nested || {}) }, fieldsSet: new Set(), },