From f80bddcc3801e4b6b2cea175ae20127e06785acb Mon Sep 17 00:00:00 2001 From: Wing-Kam Wong Date: Tue, 10 Jan 2023 14:14:53 +0800 Subject: [PATCH] feat(nocodb): pass column to formulaQueryBuilderv2 --- .../src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts | 2 +- .../nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts index 942b1dbb8f..e15235b93b 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/conditionV2.ts @@ -246,7 +246,7 @@ const parseConditionV2 = async ( const model = await column.getModel(); const formula = await column.getColOptions(); const builder = ( - await formulaQueryBuilderv2(formula.formula, null, knex, model) + await formulaQueryBuilderv2(formula.formula, null, knex, model, column) ).builder; return parseConditionV2( new Filter({ ...filter, value: knex.raw('?', [filter.value]) } as any), diff --git a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts index e020c7c4d5..0e3e33a40d 100644 --- a/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts +++ b/packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/sortV2.ts @@ -51,7 +51,8 @@ export default async function sortV2( ).formula, null, knex, - model + model, + column ) ).builder; qb.orderBy(builder, sort.direction || 'asc'); @@ -161,7 +162,8 @@ export default async function sortV2( ).formula, null, knex, - model + model, + column ) ).builder;