From 99dd5dc6be99b0ed5a2fb1e13c94e09b1605b77f Mon Sep 17 00:00:00 2001 From: Fendy Heryanto Date: Fri, 23 Jan 2026 04:19:28 +0000 Subject: [PATCH] fix oss test for "will create a formula referencing lookup referencing formula" --- .../src/db/BaseModelSqlv2/select-object.ts | 23 ++++++++++++++----- .../db/formulav2/lookup-or-ltar-builder.ts | 3 ++- .../nocodb/tests/unit/formula/initModel.ts | 8 +++++++ .../formula/tests/formula-lookup-ltar.test.ts | 12 ++++++++-- 4 files changed, 37 insertions(+), 9 deletions(-) diff --git a/packages/nocodb/src/db/BaseModelSqlv2/select-object.ts b/packages/nocodb/src/db/BaseModelSqlv2/select-object.ts index e8d283ae14..4fad05bce6 100644 --- a/packages/nocodb/src/db/BaseModelSqlv2/select-object.ts +++ b/packages/nocodb/src/db/BaseModelSqlv2/select-object.ts @@ -255,12 +255,23 @@ export const selectObject = (baseModel: IBaseModelSqlV2, logger: Logger) => { validateFormula, aliasToColumnBuilder, ); - qb.select( - baseModel.dbDriver.raw(`?? as ??`, [ - selectQb.builder, - getAs(column), - ]), - ); + + if ('toQuery' in selectQb.builder) { + const selectQbQuery = selectQb.builder.toQuery(); + qb.select( + baseModel.dbDriver.raw( + `${selectQbQuery.replaceAll('?', '\\?')} as ??`, + [getAs(column)], + ), + ); + } else { + qb.select( + baseModel.dbDriver.raw(`?? as ??`, [ + selectQb.builder, + getAs(column), + ]), + ); + } } catch (e) { logger.log(e); // return dummy select diff --git a/packages/nocodb/src/db/formulav2/lookup-or-ltar-builder.ts b/packages/nocodb/src/db/formulav2/lookup-or-ltar-builder.ts index 7d583c4b91..180c8b5a05 100644 --- a/packages/nocodb/src/db/formulav2/lookup-or-ltar-builder.ts +++ b/packages/nocodb/src/db/formulav2/lookup-or-ltar-builder.ts @@ -665,12 +665,13 @@ export const lookupOrLtarBuilder = break; } - if (selectQb) + if (selectQb) { return { builder: typeof selectQb === 'function' ? selectQb : knex.raw(selectQb as any).wrap('(', ')'), }; + } } }; diff --git a/packages/nocodb/tests/unit/formula/initModel.ts b/packages/nocodb/tests/unit/formula/initModel.ts index 97344b2ad8..686927271a 100644 --- a/packages/nocodb/tests/unit/formula/initModel.ts +++ b/packages/nocodb/tests/unit/formula/initModel.ts @@ -530,6 +530,14 @@ export async function initFormulaLookupColumns(context: ITestContext) { relationColumnId: t3_OO_t1_Ltar.id, }); + // referencing using formula field so it's populated in chunkList + await createColumn(context.context, context.tables.table3, { + title: 'table1FormulaTitleFormula', + uidt: UITypes.Formula, + formula: `{table1FormulaTitle}`, + formula_raw: `{table1FormulaTitle}`, + }); + for (const attr of t1SupportingLookupColumns) { await createLookupColumn(context.context, { base: context.base, diff --git a/packages/nocodb/tests/unit/formula/tests/formula-lookup-ltar.test.ts b/packages/nocodb/tests/unit/formula/tests/formula-lookup-ltar.test.ts index ba65de7e16..25bfc099d4 100644 --- a/packages/nocodb/tests/unit/formula/tests/formula-lookup-ltar.test.ts +++ b/packages/nocodb/tests/unit/formula/tests/formula-lookup-ltar.test.ts @@ -303,6 +303,14 @@ function formulaLookupLtarTests() { expect(parts[1]).to.contain(token); } + // referencing using formula field so it's populated in chunkList + await createColumn(_context, _tables.table1, { + title: 'table2FormulaTitleFormula', + uidt: UITypes.Formula, + formula: `{table2FormulaTitle}`, + formula_raw: `{table2FormulaTitle}`, + }); + const t1Rows = await chunkListRow({ base: _base, table: _tables.table1, @@ -318,9 +326,9 @@ function formulaLookupLtarTests() { table: _tables.table3, pks: [1, 2, 3, 4, 5, 6].map((k) => `${k}`), }); - expect(t1Rows[0].table2FormulaTitle).to.eq('T2_001?'); + expect(t1Rows[0].table2FormulaTitleFormula).to.eq('T2_001?'); expect(t2Rows[0].table1FormulaTitleConcat).to.contain('T1_001?'); - expect(t3Rows[0].table1FormulaTitle).to.eq('T1_001?'); + expect(t3Rows[0].table1FormulaTitleFormula).to.eq('T1_001?'); }); it('will create a formula column assigned as display value accessed through ltar field', async () => {