Browse Source

Merge branch 'develop' into links/props

pull/6451/head
WK Wong 1 year ago
parent
commit
b6a060bd35
  1. 3
      packages/nocodb/src/db/BaseModelSqlv2.ts

3
packages/nocodb/src/db/BaseModelSqlv2.ts

@ -692,7 +692,7 @@ class BaseModelSqlv2 {
); );
groupBySelectors.push(sanitize(column.title)); groupBySelectors.push(sanitize(column.title));
break; break;
case UITypes.Formula: case UITypes.Formula: {
let selectQb; let selectQb;
try { try {
const _selectQb = await this.getSelectQueryBuilderForFormula( const _selectQb = await this.getSelectQueryBuilderForFormula(
@ -714,6 +714,7 @@ class BaseModelSqlv2 {
selectors.push(selectQb); selectors.push(selectQb);
groupBySelectors.push(column.title); groupBySelectors.push(column.title);
break; break;
}
case UITypes.Lookup: case UITypes.Lookup:
{ {
const _selectQb = await generateBTLookupSelectQuery({ const _selectQb = await generateBTLookupSelectQuery({

Loading…
Cancel
Save