Browse Source

fix: use column title as alias in bulk insert return statement

Signed-off-by: Pranav C <pranavxc@gmail.com>
pull/7946/head
Pranav C 8 months ago
parent
commit
caf7160e7d
  1. 13
      packages/nocodb/src/db/BaseModelSqlv2.ts

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

@ -3582,11 +3582,11 @@ class BaseModelSqlv2 {
); );
} }
} else { } else {
const returningArr: string[] = []; const returningObj: Record<string, any> = {};
if (!raw) { if (!raw) {
for (const col of this.model.primaryKeys) { for (const col of this.model.primaryKeys) {
returningArr.push(col.column_name); returningObj[col.title] = col.column_name;
} }
} }
@ -3594,7 +3594,7 @@ class BaseModelSqlv2 {
!raw && (this.isPg || this.isMssql) !raw && (this.isPg || this.isMssql)
? await trx ? await trx
.batchInsert(this.tnPath, insertDatas, chunkSize) .batchInsert(this.tnPath, insertDatas, chunkSize)
.returning(this.model.primaryKeys?.length ? returningArr : '*') .returning(this.model.primaryKeys?.length ? returningObj : '*')
: await trx.batchInsert(this.tnPath, insertDatas, chunkSize); : await trx.batchInsert(this.tnPath, insertDatas, chunkSize);
} }
@ -6622,7 +6622,12 @@ export function extractCondition(
if (aliasColObjMap[alias]) { if (aliasColObjMap[alias]) {
if ( if (
[UITypes.Date, UITypes.DateTime, UITypes.LastModifiedTime, UITypes.CreatedTime].includes(aliasColObjMap[alias].uidt) [
UITypes.Date,
UITypes.DateTime,
UITypes.LastModifiedTime,
UITypes.CreatedTime,
].includes(aliasColObjMap[alias].uidt)
) { ) {
value = value?.split(','); value = value?.split(',');
// the first element would be sub_op // the first element would be sub_op

Loading…
Cancel
Save