From 7898d687907f6577deb3aa3a12af32d2198ddd0b Mon Sep 17 00:00:00 2001 From: Pranav C Date: Mon, 19 Feb 2024 05:12:41 +0000 Subject: [PATCH] feat: add composite support in baseModel ee version - bulkinsert with nested data --- packages/nocodb/src/db/BaseModelSqlv2.ts | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts index 650f2984ef..419c741de0 100644 --- a/packages/nocodb/src/db/BaseModelSqlv2.ts +++ b/packages/nocodb/src/db/BaseModelSqlv2.ts @@ -2924,7 +2924,7 @@ class BaseModelSqlv2 { return rowId; } - private async prepareNestedLinkQb({ + protected async prepareNestedLinkQb({ nestedCols, data, insertObj, @@ -3243,17 +3243,17 @@ class BaseModelSqlv2 { ); } } else { - const returningObj: Record = {}; + const returningArr: string[] = []; for (const col of this.model.primaryKeys) { - returningObj[col.title] = col.column_name; + returningArr.push(col.column_name); } responses = !raw && (this.isPg || this.isMssql) ? await trx .batchInsert(this.tnPath, insertDatas, chunkSize) - .returning(returningObj) + .returning(this.model.primaryKeys?.length ? returningArr : '*') : await trx.batchInsert(this.tnPath, insertDatas, chunkSize); } @@ -4025,7 +4025,7 @@ class BaseModelSqlv2 { } // method for validating otpions if column is single/multi select - private async validateOptions( + protected async validateOptions( column: Column, insertOrUpdateObject: Record, ) {