From 5fd8d789cd9d9d43f9b7d18db48a8f3e3e741687 Mon Sep 17 00:00:00 2001 From: Ramesh Mane <101566080+rameshmane7218@users.noreply.github.com> Date: Fri, 5 Jul 2024 08:35:41 +0000 Subject: [PATCH] fix(nocodb): backend crash issue --- packages/nocodb/src/db/BaseModelSqlv2.ts | 60 ++++++++++++++++++------ 1 file changed, 45 insertions(+), 15 deletions(-) diff --git a/packages/nocodb/src/db/BaseModelSqlv2.ts b/packages/nocodb/src/db/BaseModelSqlv2.ts index 14ad149b09..87faf0718c 100644 --- a/packages/nocodb/src/db/BaseModelSqlv2.ts +++ b/packages/nocodb/src/db/BaseModelSqlv2.ts @@ -5554,11 +5554,15 @@ class BaseModelSqlv2 { const [parentRelatedPkValue, childRelatedPkValue] = await Promise.all([ await this.dbDriver(childTn) - .select(childTable.displayValue.title) + .select( + `${childTable.table_name}.${childTable.displayValue.column_name}`, + ) .where(_wherePk(childTable.primaryKeys, childId)) .first(), await this.dbDriver(parentTn) - .select(parentTable.displayValue.title) + .select( + `${parentTable.table_name}.${parentTable.displayValue.column_name}`, + ) .where(_wherePk(parentTable.primaryKeys, oldRowId)) .first(), ]); @@ -5638,7 +5642,9 @@ class BaseModelSqlv2 { }); const childRelatedPkValue = await this.dbDriver(childTn) - .select(childTable.displayValue.title) + .select( + `${childTable.table_name}.${childTable.displayValue.column_name}`, + ) .where(_wherePk(childTable.primaryKeys, rowId)) .first(); @@ -5668,11 +5674,15 @@ class BaseModelSqlv2 { const [parentRelatedPkValue, childRelatedPkValue] = await Promise.all([ await this.dbDriver(parentTn) - .select(parentTable.displayValue.title) + .select( + `${parentTable.table_name}.${parentTable.displayValue.column_name}`, + ) .where(_wherePk(parentTable.primaryKeys, oldChildRowId)) .first(), await this.dbDriver(childTn) - .select(childTable.displayValue.title) + .select( + `${childTable.table_name}.${childTable.displayValue.column_name}`, + ) .where(_wherePk(childTable.primaryKeys, rowId)) .first(), ]); @@ -5747,11 +5757,15 @@ class BaseModelSqlv2 { const [parentRelatedPkValue, childRelatedPkValue] = await Promise.all([ await this.dbDriver(childTn) - .select(childTable.displayValue.title) + .select( + `${childTable.table_name}.${childTable.displayValue.column_name}`, + ) .where(_wherePk(childTable.primaryKeys, rowId)) .first(), await this.dbDriver(parentTn) - .select(parentTable.displayValue.title) + .select( + `${parentTable.table_name}.${parentTable.displayValue.column_name}`, + ) .where(_wherePk(parentTable.primaryKeys, oldChildRowId)) .first(), ]); @@ -5804,11 +5818,15 @@ class BaseModelSqlv2 { const [parentRelatedPkValue, childRelatedPkValue] = await Promise.all([ await this.dbDriver(parentTn) - .select(parentTable.displayValue.title) + .select( + `${parentTable.table_name}.${parentTable.displayValue.column_name}`, + ) .where(_wherePk(parentTable.primaryKeys, childId)) .first(), await this.dbDriver(childTn) - .select(childTable.displayValue.title) + .select( + `${childTable.table_name}.${childTable.displayValue.column_name}`, + ) .where(_wherePk(childTable.primaryKeys, oldRowId)) .first(), ]); @@ -5860,11 +5878,15 @@ class BaseModelSqlv2 { const [parentRelatedPkValue, childRelatedPkValue] = await Promise.all([ await this.dbDriver(childTn) - .select(childTable.displayValue.title) + .select( + `${childTable.table_name}.${childTable.displayValue.column_name}`, + ) .where(_wherePk(childTable.primaryKeys, oldChildRowId)) .first(), await this.dbDriver(parentTn) - .select(parentTable.displayValue.title) + .select( + `${parentTable.table_name}.${parentTable.displayValue.column_name}`, + ) .where(_wherePk(parentTable.primaryKeys, rowId)) .first(), ]); @@ -5905,11 +5927,15 @@ class BaseModelSqlv2 { const [parentRelatedPkValue, childRelatedPkValue] = await Promise.all([ await this.dbDriver(childTn) - .select(childTable.displayValue.title) + .select( + `${childTable.table_name}.${childTable.displayValue.column_name}`, + ) .where(_wherePk(childTable.primaryKeys, childId)) .first(), await this.dbDriver(parentTn) - .select(parentTable.displayValue.title) + .select( + `${parentTable.table_name}.${parentTable.displayValue.column_name}`, + ) .where(_wherePk(parentTable.primaryKeys, oldRowId)) .first(), ]); @@ -6049,7 +6075,9 @@ class BaseModelSqlv2 { ): Promise { if (!pkValue) { pkValue = await this.dbDriver(this.getTnPath(childModel)) - .select(childModel.displayValue.title) + .select( + `${childModel.table_name}.${childModel.displayValue.column_name}`, + ) .where(_wherePk(childModel.primaryKeys, childId)) .first(); } @@ -6290,7 +6318,9 @@ class BaseModelSqlv2 { ): Promise { if (!pkValue) { pkValue = await this.dbDriver(this.getTnPath(childModel)) - .select(childModel.displayValue.title) + .select( + `${childModel.table_name}.${childModel.displayValue.column_name}`, + ) .where(_wherePk(childModel.primaryKeys, childId)) .first(); }