Browse Source

qrcode column type: fix wrong sql query construction when using formula as value column

pull/4142/head
Daniel Spaude 2 years ago
parent
commit
8e6e8da06c
No known key found for this signature in database
GPG Key ID: 654A3D1FA4F35FFE
  1. 53
      packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts

53
packages/nocodb/src/lib/db/sql-data-mapper/lib/sql/BaseModelSqlv2.ts

@ -1368,7 +1368,57 @@ class BaseModelSqlv2 {
}); });
console.log('qrCodeColumn', qrCodeColumn); console.log('qrCodeColumn', qrCodeColumn);
console.log('qrValueColumn', qrValueColumn); console.log('qrValueColumn', qrValueColumn);
qb.select({ [column.column_name]: qrValueColumn.column_name }); // qb.select({ [column.column_name]: qrValueColumn.column_name });
switch (qrValueColumn.uidt) {
case UITypes.Formula:
{
const formula =
await qrValueColumn.getColOptions<FormulaColumn>();
if (formula.error) continue;
const selectQb = await formulaQueryBuilderv2(
formula.formula,
null,
this.dbDriver,
this.model
// this.aliasToColumn
);
// todo: verify syntax of as ? / ??
// qb.select(
// this.dbDriver.raw(`?? as ??`, [
// selectQb.builder,
// sanitize(column.title),
// ])
// );
// qb.select({
// [column.column_name]: this.dbDriver.raw(`?? as ??`, [
// selectQb.builder,
// sanitize(column.title),
// ]),
// });
qb.select({
[column.column_name]: selectQb.builder,
});
// const formulOption = await col.getColOptions<FormulaColumn>();
// const { builder } = await formulaQueryBuilderv2(
// formulOption.formula,
// alias,
// knex,
// model,
// { ...aliasToColumn, [col.id]: null }
// );
// builder.sql = '(' + builder.sql + ')';
// aliasToColumn[col.id] = builder;
}
break;
default: {
qb.select({ [column.column_name]: qrValueColumn.column_name });
break;
}
}
break; break;
} }
case 'Formula': case 'Formula':
@ -1410,6 +1460,7 @@ class BaseModelSqlv2 {
break; break;
} }
} }
console.debug('qb.toQuery(): ', qb.toQuery());
qb.select(res); qb.select(res);
} }

Loading…
Cancel
Save