fix: fix link lookup a formula field reference a lookup field reference a link field (#2002)

* fix: fix link lookup a formula field reference a lookup field reference a link field

* chore: aggregate should use query model

* fix: fix date to char

* fix: fix sum formula cast issue

Author: nichenqin

apps/nestjs-backend/src/db-provider/select-query/postgres/select-query.postgres.spec.ts

@@ -158,4 +158,20 @@ describe('SelectQueryPostgres unit-aware date helpers', () => {
       `DATE_TRUNC('${expectedUnit}', date_a::timestamp) = DATE_TRUNC('${expectedUnit}', date_b::timestamp)`
     );
   });
+
+  describe('numeric aggregate rewrites', () => {
+    it('sum rewrites multiple params to addition with numeric coercion', () => {
+      const sql = query.sum(['column_a', 'column_b', '10']);
+      expect(sql).toBe(
+        "(COALESCE(NULLIF(REGEXP_REPLACE((column_a)::text, '[^0-9.+-]', '', 'g'), '')::double precision, 0) + COALESCE(NULLIF(REGEXP_REPLACE((column_b)::text, '[^0-9.+-]', '', 'g'), '')::double precision, 0) + COALESCE(NULLIF(REGEXP_REPLACE((10)::text, '[^0-9.+-]', '', 'g'), '')::double precision, 0))"
+      );
+    });
+
+    it('average divides the rewritten sum by parameter count', () => {
+      const sql = query.average(['column_a', '10']);
+      expect(sql).toBe(
+        "((COALESCE(NULLIF(REGEXP_REPLACE((column_a)::text, '[^0-9.+-]', '', 'g'), '')::double precision, 0) + COALESCE(NULLIF(REGEXP_REPLACE((10)::text, '[^0-9.+-]', '', 'g'), '')::double precision, 0))) / 2"
+      );
+    });
+  });
 });

apps/nestjs-backend/src/db-provider/select-query/postgres/select-query.postgres.ts

@@ -1,4 +1,5 @@
 import { DbFieldType } from '@teable/core';
+import type { ISelectFormulaConversionContext } from '../../../features/record/query-builder/sql-conversion.visitor';
 import { SelectQueryAbstract } from '../select-query.abstract';
 
 /**
@@ -8,6 +9,17 @@ import { SelectQueryAbstract } from '../select-query.abstract';
  * mutable functions and have different optimization strategies.
  */
 export class SelectQueryPostgres extends SelectQueryAbstract {
+  private get tableAlias(): string | undefined {
+    const ctx = this.context as ISelectFormulaConversionContext | undefined;
+    return ctx?.tableAlias;
+  }
+
+  private qualifySystemColumn(column: string): string {
+    const quoted = `"${column}"`;
+    const alias = this.tableAlias;
+    return alias ? `"${alias}".${quoted}` : quoted;
+  }
+
   private toNumericSafe(expr: string): string {
     // Safely coerce any scalar to a floating-point number:
     // - Strip everything except digits, sign, decimal point
@@ -16,6 +28,10 @@ export class SelectQueryPostgres extends SelectQueryAbstract {
     return `NULLIF(REGEXP_REPLACE((${expr})::text, '[^0-9.+-]', '', 'g'), '')::double precision`;
   }
 
+  private coalesceNumeric(expr: string): string {
+    return `COALESCE(${this.toNumericSafe(expr)}, 0)`;
+  }
+
   private isEmptyStringLiteral(value: string): boolean {
     return value.trim() === "''";
   }
@@ -220,12 +236,23 @@ export class SelectQueryPostgres extends SelectQueryAbstract {
   }
   // Numeric Functions
   sum(params: string[]): string {
-    // In SELECT context, we can use window functions and aggregates more freely
-    return `SUM(${this.joinParams(params)})`;
+    if (params.length === 0) {
+      return '0';
+    }
+
+    const terms = params.map((param) => this.coalesceNumeric(param));
+    if (terms.length === 1) {
+      return terms[0];
+    }
+    return `(${terms.join(' + ')})`;
   }
 
   average(params: string[]): string {
-    return `AVG(${this.joinParams(params)})`;
+    if (params.length === 0) {
+      return '0';
+    }
+    const numerator = this.sum(params);
+    return `(${numerator}) / ${params.length}`;
   }
 
   max(params: string[]): string {
@@ -488,7 +515,7 @@ export class SelectQueryPostgres extends SelectQueryAbstract {
 
   lastModifiedTime(): string {
     // This would typically reference a system column
-    return `"__last_modified_time"`;
+    return this.qualifySystemColumn('__last_modified_time');
   }
 
   minute(date: string): string {
@@ -539,7 +566,7 @@ export class SelectQueryPostgres extends SelectQueryAbstract {
 
   createdTime(): string {
     // This would typically reference a system column
-    return `"__created_time"`;
+    return this.qualifySystemColumn('__created_time');
   }
 
   // Logical Functions
@@ -680,12 +707,12 @@ export class SelectQueryPostgres extends SelectQueryAbstract {
   // System Functions
   recordId(): string {
     // This would typically reference the primary key
-    return `__id`;
+    return this.qualifySystemColumn('__id');
   }
 
   autoNumber(): string {
     // This would typically reference an auto-increment column
-    return `__auto_number`;
+    return this.qualifySystemColumn('__auto_number');
   }
 
   textAll(value: string): string {

apps/nestjs-backend/src/db-provider/select-query/sqlite/select-query.sqlite.spec.ts

@@ -151,4 +151,20 @@ describe('SelectQuerySqlite unit-aware date helpers', () => {
     const sql = query.isSame('date_a', 'date_b', `'${literal}'`);
     expect(sql).toBe(`STRFTIME('${format}', date_a) = STRFTIME('${format}', date_b)`);
   });
+
+  describe('numeric aggregate rewrites', () => {
+    it('sum rewrites multiple params to addition with numeric coercion', () => {
+      const sql = query.sum(['column_a', 'column_b', '10']);
+      expect(sql).toBe(
+        '(COALESCE(CAST((column_a) AS REAL), 0) + COALESCE(CAST((column_b) AS REAL), 0) + COALESCE(CAST((10) AS REAL), 0))'
+      );
+    });
+
+    it('average divides the rewritten sum by parameter count', () => {
+      const sql = query.average(['column_a', '10']);
+      expect(sql).toBe(
+        '((COALESCE(CAST((column_a) AS REAL), 0) + COALESCE(CAST((10) AS REAL), 0))) / 2'
+      );
+    });
+  });
 });

apps/nestjs-backend/src/db-provider/select-query/sqlite/select-query.sqlite.ts

@@ -1,3 +1,4 @@
+import type { ISelectFormulaConversionContext } from '../../../features/record/query-builder/sql-conversion.visitor';
 import { SelectQueryAbstract } from '../select-query.abstract';
 
 /**
@@ -7,6 +8,17 @@ import { SelectQueryAbstract } from '../select-query.abstract';
  * more functions and have different optimization strategies.
  */
 export class SelectQuerySqlite extends SelectQueryAbstract {
+  private get tableAlias(): string | undefined {
+    const ctx = this.context as ISelectFormulaConversionContext | undefined;
+    return ctx?.tableAlias;
+  }
+
+  private qualifySystemColumn(column: string): string {
+    const quoted = `"${column}"`;
+    const alias = this.tableAlias;
+    return alias ? `"${alias}".${quoted}` : quoted;
+  }
+
   private isEmptyStringLiteral(value: string): boolean {
     return value.trim() === "''";
   }
@@ -31,13 +43,28 @@ export class SelectQuerySqlite extends SelectQueryAbstract {
     return `(${normalizedLeft} ${operator} ${normalizedRight})`;
   }
 
+  private coalesceNumeric(expr: string): string {
+    return `COALESCE(CAST((${expr}) AS REAL), 0)`;
+  }
+
   // Numeric Functions
   sum(params: string[]): string {
-    return `SUM(${this.joinParams(params)})`;
+    if (params.length === 0) {
+      return '0';
+    }
+    const terms = params.map((param) => this.coalesceNumeric(param));
+    if (terms.length === 1) {
+      return terms[0];
+    }
+    return `(${terms.join(' + ')})`;
   }
 
   average(params: string[]): string {
-    return `AVG(${this.joinParams(params)})`;
+    if (params.length === 0) {
+      return '0';
+    }
+    const numerator = this.sum(params);
+    return `(${numerator}) / ${params.length}`;
   }
 
   max(params: string[]): string {
@@ -399,7 +426,7 @@ export class SelectQuerySqlite extends SelectQueryAbstract {
   }
 
   lastModifiedTime(): string {
-    return `"__last_modified_time"`;
+    return this.qualifySystemColumn('__last_modified_time');
   }
 
   minute(date: string): string {
@@ -445,7 +472,7 @@ export class SelectQuerySqlite extends SelectQueryAbstract {
   }
 
   createdTime(): string {
-    return `"__created_time"`;
+    return this.qualifySystemColumn('__created_time');
   }
 
   // Logical Functions
@@ -546,11 +573,11 @@ export class SelectQuerySqlite extends SelectQueryAbstract {
 
   // System Functions
   recordId(): string {
-    return `__id`;
+    return this.qualifySystemColumn('__id');
   }
 
   autoNumber(): string {
-    return `__auto_number`;
+    return this.qualifySystemColumn('__auto_number');
   }
 
   textAll(value: string): string {

apps/nestjs-backend/src/features/aggregation/aggregation.service.interface.ts

@@ -29,6 +29,7 @@ export interface IAggregationService {
     withFieldIds?: string[];
     withView?: IWithView;
     search?: [string, string?, boolean?];
+    useQueryModel?: boolean;
   }): Promise<IRawAggregationValue>;
 
   /**

apps/nestjs-backend/src/features/aggregation/aggregation.service.ts

@@ -89,8 +89,9 @@ export class AggregationService implements IAggregationService {
     withFieldIds?: string[];
     withView?: IWithView;
     search?: [string, string?, boolean?];
+    useQueryModel?: boolean;
   }): Promise<IRawAggregationValue> {
-    const { tableId, withFieldIds, withView, search } = params;
+    const { tableId, withFieldIds, withView, search, useQueryModel } = params;
     // Retrieve the current user's ID to build user-related query conditions
     const currentUserId = this.cls.get('user.id');
 
@@ -113,6 +114,7 @@ export class AggregationService implements IAggregationService {
       statisticFields,
       withUserId: currentUserId,
       withView,
+      useQueryModel,
     });
 
     const aggregationResult = rawAggregationData && rawAggregationData[0];
@@ -150,6 +152,7 @@ export class AggregationService implements IAggregationService {
       dbTableName,
       fieldInstanceMap,
       withView,
+      useQueryModel,
     });
 
     return { aggregations: aggregationsWithGroup };
@@ -204,6 +207,7 @@ export class AggregationService implements IAggregationService {
     statisticFields?: IAggregationField[];
     withUserId?: string;
     withView?: IWithView;
+    useQueryModel?: boolean;
   }) {
     const {
       dbTableName,
@@ -215,6 +219,7 @@ export class AggregationService implements IAggregationService {
       groupBy,
       withView,
       tableId,
+      useQueryModel,
     } = params;
 
     if (!statisticFields?.length) {
@@ -244,6 +249,7 @@ export class AggregationService implements IAggregationService {
       currentUserId: withUserId,
       // Limit link/lookup CTEs to enabled fields so denied fields resolve to NULL
       projection,
+      useQueryModel,
     });
 
     // Attach permission CTE and switch FROM to the CTE alias
@@ -273,6 +279,7 @@ export class AggregationService implements IAggregationService {
     dbTableName: string;
     fieldInstanceMap: Record<string, IFieldInstance>;
     withView?: IWithView;
+    useQueryModel?: boolean;
   }) {
     const {
       dbTableName,
@@ -284,6 +291,7 @@ export class AggregationService implements IAggregationService {
       fieldInstanceMap,
       withView,
       tableId,
+      useQueryModel,
     } = params;
 
     if (!groupBy || !statisticFields) return aggregations;
@@ -309,6 +317,7 @@ export class AggregationService implements IAggregationService {
         statisticFields,
         withUserId: currentUserId,
         withView,
+        useQueryModel,
       }))!;
 
       const currentGroupFieldId = groupByFields[i].fieldId;

apps/nestjs-backend/src/features/aggregation/open-api/aggregation-open-api.service.ts

@@ -59,6 +59,7 @@ export class AggregationOpenApiService {
       tableId: tableId,
       withView,
       search: query?.search,
+      useQueryModel: true,
     });
     return { aggregations: result?.aggregations };
   }

apps/nestjs-backend/src/features/calculation/link.service.ts

@@ -818,6 +818,8 @@ export class LinkService {
         {
           tableIdOrDbTableName: tableId,
           viewId: undefined,
+          rawProjection: true,
+          preferRawFieldReferences: true,
         }
       );
 

apps/nestjs-backend/src/features/field/field-calculate/field-supplement.service.ts

@@ -230,13 +230,26 @@ export class FieldSupplementService {
     const foreignTableName = await this.getDbTableName(foreignTableId);
 
     if (!lookupFieldId) {
-      const { id: defaultLookupFieldId } = await this.prismaService
-        .txClient()
-        .field.findFirstOrThrow({
-          where: { tableId: foreignTableId, isPrimary: true },
-          select: { id: true },
-        });
-      lookupFieldId = defaultLookupFieldId;
+      const labelField = await this.prismaService.txClient().field.findFirst({
+        where: {
+          tableId: foreignTableId,
+          name: 'Label',
+          deletedTime: null,
+        },
+        select: { id: true },
+      });
+
+      if (labelField?.id) {
+        lookupFieldId = labelField.id;
+      } else {
+        const { id: defaultLookupFieldId } = await this.prismaService
+          .txClient()
+          .field.findFirstOrThrow({
+            where: { tableId: foreignTableId, isPrimary: true },
+            select: { id: true },
+          });
+        lookupFieldId = defaultLookupFieldId;
+      }
     }
 
     if (baseId) {
@@ -305,13 +318,21 @@ export class FieldSupplementService {
       }
     }
     if (!lookupFieldId) {
-      const { id: defaultLookupFieldId } = await this.prismaService
-        .txClient()
-        .field.findFirstOrThrow({
-          where: { tableId: foreignTableId, isPrimary: true, deletedTime: null },
-          select: { id: true },
-        });
-      lookupFieldId = defaultLookupFieldId;
+      const labelField = await this.prismaService.txClient().field.findFirst({
+        where: { tableId: foreignTableId, name: 'Label', deletedTime: null },
+        select: { id: true },
+      });
+      if (labelField?.id) {
+        lookupFieldId = labelField.id;
+      } else {
+        const { id: defaultLookupFieldId } = await this.prismaService
+          .txClient()
+          .field.findFirstOrThrow({
+            where: { tableId: foreignTableId, isPrimary: true, deletedTime: null },
+            select: { id: true },
+          });
+        lookupFieldId = defaultLookupFieldId;
+      }
     }
 
     if (baseId) {

apps/nestjs-backend/src/features/record/computed/services/computed-evaluator.service.ts

@@ -88,6 +88,7 @@ export class ComputedEvaluatorService {
         tableIdOrDbTableName: tableId,
         projection: Array.from(validFieldIdSet),
         rawProjection: true,
+        preferRawFieldReferences: true,
       });
 
       const idCol = alias ? `${alias}.__id` : '__id';