From 5cf3a236fefb51d86a07f2e844d03348c82cc874 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Tue, 22 Feb 2022 19:40:14 +0800
Subject: [PATCH 1/9] wip: cater fk not pk case

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../components/virtualCell/hasManyCell.vue    | 28 +++++++++++++++----
 .../lib/dataMapper/lib/sql/BaseModelSql.ts    |  3 +-
 2 files changed, 25 insertions(+), 6 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
index 43cbf9a830..7921571148 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
@@ -2,7 +2,7 @@
   <div class="d-flex d-100 chips-wrapper" :class="{active}">
     <template v-if="!isForm">
       <div class="chips d-flex align-center img-container flex-grow-1 hm-items">
-        <template v-if="value||localState">
+        <template v-if="value|| localState">
           <item-chip
             v-for="(ch,i) in (value|| localState)"
             :key="i"
@@ -54,7 +54,7 @@
       :parent-meta="meta"
       :query-params="{
         ...childQueryParams,
-        where: isNew ? null :`~not(${childForeignKey},eq,${parentId})~or(${childForeignKey},is,null)`,
+        where: isNew ? null :`~not(${childForeignKey},eq,${childForeignKeyVal != '' ? childForeignKeyVal : parentId})~or(${childForeignKey},is,null)`,
       }"
       :is-public="isPublic"
       :password="password"
@@ -80,7 +80,7 @@
       :column="column"
       :query-params="{
         ...childQueryParams,
-        where: `(${childForeignKey},eq,${parentId})`
+        where: `(${childForeignKey},eq,${childForeignKeyVal != '' ? childForeignKeyVal : parentId})`
       }"
       :is-public="isPublic"
       :row-id="parentId"
@@ -252,6 +252,9 @@ export default {
     },
     parentId() {
       return this.meta && this.meta.columns ? this.meta.columns.filter(c => c.pk).map(c => this.row[c._cn]).join('___') : ''
+    },
+    childForeignKeyVal() {
+      return this.meta && this.meta.columns ? this.meta.columns.filter(c => c._cn === this.childForeignKey).map(c => this.row[c._cn]) : ''
     }
   },
   watch: {
@@ -347,7 +350,10 @@ export default {
       this.newRecordModal = true
     },
     async addChildToParent(child) {
+      console.log("invoking addChildToParent ...")
+      console.log(child)
       if (this.isNew && this.localState.every(it => it[this.childForeignKey] !== child[this.childPrimaryKey])) {
+        console.log(child)
         this.localState.push(child)
         this.$emit('update:localState', [...this.localState])
         this.$emit('saveRow')
@@ -359,15 +365,26 @@ export default {
       const _cn = this.childForeignKey
       this.newRecordModal = false
 
+      // wingkwong
+
+      console.log(_cn) // CustomerEmail
+      console.log(parseIfInteger(this.parentId)) // 1
+      console.log(child[this.childForeignKey]) // user1@test.com
+      console.log(this.hm)
+      // console.log(child[`${this.hm._rtn}Read`][this.hm && this.parentMeta && this.parentMeta.columns.find(v => v.pv)._cn])
+      // console.log((this.hm && child[`${this.hm._rtn}Read`] && child[`${this.hm._rtn}Read`][this.hm && _cn]) || parseIfInteger(this.parentId))
+      console.log(child[this.childPrimaryCol])
       await this.childApi.update(id, {
-        [_cn]: parseIfInteger(this.parentId)
+        [_cn]: child[this.childForeignKey]
+        // [_cn]:
+        // (this.hm && child[`${this.hm._rtn}Read`] && child[`${this.hm._rtn}Read`][this.hm && _cn]) || parseIfInteger(this.parentId)
       }, {
         [_cn]: child[this.childForeignKey]
       })
 
       this.$emit('loadTableData')
       if ((this.childListModal || this.isForm) && this.$refs.childList) {
-        this.$refs.childList.loadData()
+        await this.$refs.childList.loadData()
       }
     },
     async editChild(child) {
@@ -394,6 +411,7 @@ export default {
       }
     },
     getCellValue(cellObj) {
+      console.log(cellObj)
       if (cellObj) {
         if (this.childMeta && this.childPrimaryCol) {
           return cellObj[this.childPrimaryCol]
diff --git a/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts b/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts
index bc77c4b808..0e40729d77 100644
--- a/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts
+++ b/packages/nocodb/src/lib/dataMapper/lib/sql/BaseModelSql.ts
@@ -1279,6 +1279,7 @@ class BaseModelSql extends BaseModel {
       driver.union(
         parent.map(p => {
           const id =
+            p[_cn] ||
             p[this.columnToAlias?.[this.pks[0].cn] || this.pks[0].cn] ||
             p[this.pks[0].cn];
           const query = driver(this.dbModels[child].tnPath)
@@ -1296,7 +1297,7 @@ class BaseModelSql extends BaseModel {
     const gs = _.groupBy(childs, _cn);
     parent.forEach(row => {
       row[`${this.dbModels?.[child]?._tn || child}List`] =
-        gs[row[this.pks[0]._cn]] || [];
+        gs[row[_cn] || row[this.pks[0]._cn]] || [];
     });
   }
 

From 0be903f8df83efb9590b0e1264a559102373eef2 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 23 Feb 2022 13:51:12 +0800
Subject: [PATCH 2/9] fix: bt & hm cells

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../components/virtualCell/belongsToCell.vue  | 20 ++++++++++++++++---
 .../components/virtualCell/hasManyCell.vue    | 11 +++++-----
 2 files changed, 22 insertions(+), 9 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue
index a3b81a0fb7..111d2529e2 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue
@@ -34,7 +34,10 @@
       :primary-col="parentPrimaryCol"
       :primary-key="parentPrimaryKey"
       :api="parentApi"
-      :query-params="parentQueryParams"
+      :query-params="{
+        ...parentQueryParams,
+        where: isNew ? null :`~not(${parentPrimaryKey},eq,${parentId})~or(${parentPrimaryKey},is,null)`,
+      }"
       :is-public="isPublic"
       :tn="bt && bt.rtn"
       :password="password"
@@ -165,13 +168,24 @@ export default {
       //   : null
     },
     parentId() {
-      return this.pid ?? (this.value && this.parentMeta && this.parentMeta.columns.filter(c => c.pk).map(c => this.value[c._cn]).join('___'))
+      return this.pid ??
+        ((this.parentMeta.columns
+          .filter(c => c._cn === (this.parentMeta && (this.parentMeta.columns.find(c => c.cn === this.bt.cn) || {})._cn))
+          .map(c => this.value[c._cn]).join('___')) ||
+        (this.value && this.parentMeta && this.parentMeta.columns.filter(c => c.pk).map(c => this.value[c._cn]).join('___')))
     },
     parentPrimaryCol() {
       return this.parentMeta && (this.parentMeta.columns.find(c => c.pv) || {})._cn
     },
     parentPrimaryKey() {
-      return this.parentMeta && (this.parentMeta.columns.find(c => c.pk) || {})._cn
+      // ((this.parentMeta.columns
+      //   .filter(c => c._cn === (this.parentMeta && (this.parentMeta.columns.find(c => c.cn === this.bt.cn) || {})._cn))
+      //   .map(c => this.value[c._cn]).join('___'))
+
+      console.log((this.parentMeta && (this.parentMeta.columns.find(c => c.cn === this.bt.cn) || {})._cn) ||
+        (this.parentMeta && (this.parentMeta.columns.find(c => c.pk) || {})._cn))
+      return (this.parentMeta && (this.parentMeta.columns.find(c => c.cn === this.bt.cn) || {})._cn) ||
+        (this.parentMeta && (this.parentMeta.columns.find(c => c.pk) || {})._cn)
     },
     parentQueryParams() {
       if (!this.parentMeta) {
diff --git a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
index 7921571148..05ad634bb7 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
@@ -54,7 +54,7 @@
       :parent-meta="meta"
       :query-params="{
         ...childQueryParams,
-        where: isNew ? null :`~not(${childForeignKey},eq,${childForeignKeyVal != '' ? childForeignKeyVal : parentId})~or(${childForeignKey},is,null)`,
+        where: isNew ? null :`~not(${childForeignKey},eq,${parentId})~or(${childForeignKey},is,null)`,
       }"
       :is-public="isPublic"
       :password="password"
@@ -80,7 +80,7 @@
       :column="column"
       :query-params="{
         ...childQueryParams,
-        where: `(${childForeignKey},eq,${childForeignKeyVal != '' ? childForeignKeyVal : parentId})`
+        where: `(${childForeignKey},eq,${parentId})`
       }"
       :is-public="isPublic"
       :row-id="parentId"
@@ -251,11 +251,10 @@ export default {
       }
     },
     parentId() {
-      return this.meta && this.meta.columns ? this.meta.columns.filter(c => c.pk).map(c => this.row[c._cn]).join('___') : ''
+      return (this.meta && this.meta.columns &&
+        (this.meta.columns.filter(c => c._cn === this.childForeignKey).map(c => this.row[c._cn]).join('___') ||
+        this.meta.columns.filter(c => c.pk).map(c => this.row[c._cn]).join('___'))) || ''
     },
-    childForeignKeyVal() {
-      return this.meta && this.meta.columns ? this.meta.columns.filter(c => c._cn === this.childForeignKey).map(c => this.row[c._cn]) : ''
-    }
   },
   watch: {
     isNew(n, o) {

From 8f66bdbad03a3f864a7a067b86934446fcecb120 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 23 Feb 2022 14:05:49 +0800
Subject: [PATCH 3/9] fix: addChildToParent > update > new data

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../components/virtualCell/hasManyCell.vue    | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
index 05ad634bb7..863777c5e7 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
@@ -142,7 +142,7 @@ import Pagination from '@/components/project/spreadsheet/components/pagination'
 import ListItems from '@/components/project/spreadsheet/components/virtualCell/components/listItems'
 import ListChildItems from '@/components/project/spreadsheet/components/virtualCell/components/listChildItems'
 import listChildItemsModal
-  from '@/components/project/spreadsheet/components/virtualCell/components/listChildItemsModal'
+from '@/components/project/spreadsheet/components/virtualCell/components/listChildItemsModal'
 import { parseIfInteger } from '@/helpers'
 import ItemChip from '~/components/project/spreadsheet/components/virtualCell/components/itemChip'
 
@@ -254,7 +254,7 @@ export default {
       return (this.meta && this.meta.columns &&
         (this.meta.columns.filter(c => c._cn === this.childForeignKey).map(c => this.row[c._cn]).join('___') ||
         this.meta.columns.filter(c => c.pk).map(c => this.row[c._cn]).join('___'))) || ''
-    },
+    }
   },
   watch: {
     isNew(n, o) {
@@ -349,10 +349,7 @@ export default {
       this.newRecordModal = true
     },
     async addChildToParent(child) {
-      console.log("invoking addChildToParent ...")
-      console.log(child)
       if (this.isNew && this.localState.every(it => it[this.childForeignKey] !== child[this.childPrimaryKey])) {
-        console.log(child)
         this.localState.push(child)
         this.$emit('update:localState', [...this.localState])
         this.$emit('saveRow')
@@ -364,19 +361,9 @@ export default {
       const _cn = this.childForeignKey
       this.newRecordModal = false
 
-      // wingkwong
-
-      console.log(_cn) // CustomerEmail
-      console.log(parseIfInteger(this.parentId)) // 1
-      console.log(child[this.childForeignKey]) // user1@test.com
-      console.log(this.hm)
-      // console.log(child[`${this.hm._rtn}Read`][this.hm && this.parentMeta && this.parentMeta.columns.find(v => v.pv)._cn])
-      // console.log((this.hm && child[`${this.hm._rtn}Read`] && child[`${this.hm._rtn}Read`][this.hm && _cn]) || parseIfInteger(this.parentId))
-      console.log(child[this.childPrimaryCol])
       await this.childApi.update(id, {
-        [_cn]: child[this.childForeignKey]
-        // [_cn]:
-        // (this.hm && child[`${this.hm._rtn}Read`] && child[`${this.hm._rtn}Read`][this.hm && _cn]) || parseIfInteger(this.parentId)
+        [_cn]:
+        (this.hm && child[`${this.hm._rtn}Read`] && child[`${this.hm._rtn}Read`][this.hm && _cn]) || parseIfInteger(this.parentId)
       }, {
         [_cn]: child[this.childForeignKey]
       })
@@ -410,7 +397,6 @@ export default {
       }
     },
     getCellValue(cellObj) {
-      console.log(cellObj)
       if (cellObj) {
         if (this.childMeta && this.childPrimaryCol) {
           return cellObj[this.childPrimaryCol]

From 8df43e0d1069ad444c225b3dc7ee25f9fc932093 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 23 Feb 2022 15:56:56 +0800
Subject: [PATCH 4/9] fix: addChildToParent > update > new data

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../project/spreadsheet/components/virtualCell/hasManyCell.vue | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
index 863777c5e7..6a5e04a9db 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
@@ -362,8 +362,7 @@ export default {
       this.newRecordModal = false
 
       await this.childApi.update(id, {
-        [_cn]:
-        (this.hm && child[`${this.hm._rtn}Read`] && child[`${this.hm._rtn}Read`][this.hm && _cn]) || parseIfInteger(this.parentId)
+        [_cn]: parseIfInteger(this.parentId)
       }, {
         [_cn]: child[this.childForeignKey]
       })

From a74026f5b4b9d15a8dc15979dd5c47564e39f726 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Wed, 23 Feb 2022 19:17:46 +0800
Subject: [PATCH 5/9] fix: handle foreign key constraint violation

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../virtualCell/components/listItems.vue      |  5 ++++-
 .../components/virtualCell/hasManyCell.vue    | 20 ++++++++++++++++---
 2 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/components/listItems.vue b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/components/listItems.vue
index 224d56182b..daa64d6734 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/components/listItems.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/components/listItems.vue
@@ -150,7 +150,10 @@ export default {
         if (!this.api) {
           return
         }
-
+        const isByPass = this.queryParams.isByPass || false
+        if (isByPass) {
+          return
+        }
         let where = this.queryParams.where || ''
         if (this.query) {
           where += (where ? '~and' : '') + `(${this.primaryCol},like,%${this.query}%)`
diff --git a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
index 6a5e04a9db..e452758d23 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
@@ -54,7 +54,16 @@
       :parent-meta="meta"
       :query-params="{
         ...childQueryParams,
-        where: isNew ? null :`~not(${childForeignKey},eq,${parentId})~or(${childForeignKey},is,null)`,
+        // return empty set if childForeignKeyVal is empty
+        // to avoid foreign key constraint violation in real relation
+        isByPass: !isVirtualRelation && childForeignKeyVal === '',
+        where:
+          // show all for new record
+          isNew ? null :
+          // filter out those selected items
+          `~not(${childForeignKey},eq,${parentId})` +
+          // allow the child with empty key
+          '~or(' + childForeignKey + ',is,null)'
       }"
       :is-public="isPublic"
       :password="password"
@@ -221,6 +230,12 @@ export default {
     childForeignKey() {
       return this.childMeta && (this.childMeta.columns.find(c => c.cn === this.hm.cn) || {})._cn
     },
+    childForeignKeyVal() {
+      return this.meta && this.meta.columns ? this.meta.columns.filter(c => c._cn === this.childForeignKey).map(c => this.row[c._cn] || '').join('___') : ''
+    },
+    isVirtualRelation() {
+      return (this.childMeta && (!!this.childMeta.columns.find(c => c.cn === this.hm.cn && this.hm.type === 'virtual'))) || false
+    },
     disabledChildColumns() {
       return { [this.childForeignKey]: true }
     },
@@ -252,7 +267,7 @@ export default {
     },
     parentId() {
       return (this.meta && this.meta.columns &&
-        (this.meta.columns.filter(c => c._cn === this.childForeignKey).map(c => this.row[c._cn]).join('___') ||
+        (this.meta.columns.filter(c => c._cn === this.childForeignKey).map(c => this.row[c._cn] || '').join('___') ||
         this.meta.columns.filter(c => c.pk).map(c => this.row[c._cn]).join('___'))) || ''
     }
   },
@@ -360,7 +375,6 @@ export default {
       const id = this.childMeta.columns.filter(c => c.pk).map(c => child[c._cn]).join('___')
       const _cn = this.childForeignKey
       this.newRecordModal = false
-
       await this.childApi.update(id, {
         [_cn]: parseIfInteger(this.parentId)
       }, {

From dc81004163e3fb541b444aaec7436f42852a08b3 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 24 Feb 2022 14:27:54 +0800
Subject: [PATCH 6/9] wip: revise bypass logic

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../components/virtualCell/hasManyCell.vue    | 21 ++++++++++++++++---
 1 file changed, 18 insertions(+), 3 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
index e452758d23..f63cec4214 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
@@ -54,9 +54,9 @@
       :parent-meta="meta"
       :query-params="{
         ...childQueryParams,
-        // return empty set if childForeignKeyVal is empty
-        // to avoid foreign key constraint violation in real relation
-        isByPass: !isVirtualRelation && childForeignKeyVal === '',
+        // check if it needs to bypass to
+        // avoid foreign key constraint violation in real relation
+        isByPass,
         where:
           // show all for new record
           isNew ? null :
@@ -225,17 +225,31 @@ export default {
       return this.meta && (this.meta.columns.find(c => c.pv) || {})._cn
     },
     childPrimaryKey() {
+      console.log('childPrimaryKey= ' + (this.childMeta && (this.childMeta.columns.find(c => c.pk) || {})._cn))
       return this.childMeta && (this.childMeta.columns.find(c => c.pk) || {})._cn
     },
     childForeignKey() {
+      console.log('childForeignKey= ' + (this.childMeta && (this.childMeta.columns.find(c => c.cn === this.hm.cn) || {})._cn))
       return this.childMeta && (this.childMeta.columns.find(c => c.cn === this.hm.cn) || {})._cn
     },
     childForeignKeyVal() {
+      console.log('childForeignKeyVal: ' + (this.meta && this.meta.columns ? this.meta.columns.filter(c => c._cn === this.childForeignKey).map(c => this.row[c._cn] || '').join('___') : ''))
       return this.meta && this.meta.columns ? this.meta.columns.filter(c => c._cn === this.childForeignKey).map(c => this.row[c._cn] || '').join('___') : ''
     },
     isVirtualRelation() {
       return (this.childMeta && (!!this.childMeta.columns.find(c => c.cn === this.hm.cn && this.hm.type === 'virtual'))) || false
     },
+    isByPass() {
+      if (this.isVirtualRelation) {
+        return false
+      }
+      // if child fk references a column in parent which is not pk,
+      // then this column has to be filled
+      if (((this.meta && this.meta.columns.find(c => !c.pk && c.cn === this.hm.rcn)) || false)) {
+        return this.childForeignKeyVal === ''
+      }
+      return false
+    },
     disabledChildColumns() {
       return { [this.childForeignKey]: true }
     },
@@ -512,6 +526,7 @@ export default {
  *
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *

From 900f898d283999f3456d3d5db4a8a9e65c5cb7f5 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Thu, 24 Feb 2022 18:53:37 +0800
Subject: [PATCH 7/9] wip: revise bt logic

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../components/virtualCell/belongsToCell.vue  | 43 ++++++++++---------
 1 file changed, 23 insertions(+), 20 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue
index 111d2529e2..46ee1ebabe 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue
@@ -36,7 +36,8 @@
       :api="parentApi"
       :query-params="{
         ...parentQueryParams,
-        where: isNew ? null :`~not(${parentPrimaryKey},eq,${parentId})~or(${parentPrimaryKey},is,null)`,
+        isByPass,
+        where: isNew ? null :`~not(${parentReferenceKey},eq,${parentReferenceVal})~or(${parentReferenceKey},is,null)`,
       }"
       :is-public="isPublic"
       :tn="bt && bt.rtn"
@@ -109,6 +110,7 @@
 import ListItems from '@/components/project/spreadsheet/components/virtualCell/components/listItems'
 import ListChildItems from '@/components/project/spreadsheet/components/virtualCell/components/listChildItems'
 import ItemChip from '~/components/project/spreadsheet/components/virtualCell/components/itemChip'
+import { parseIfInteger } from '@/helpers'
 
 export default {
   name: 'BelongsToCell',
@@ -168,24 +170,22 @@ export default {
       //   : null
     },
     parentId() {
-      return this.pid ??
-        ((this.parentMeta.columns
-          .filter(c => c._cn === (this.parentMeta && (this.parentMeta.columns.find(c => c.cn === this.bt.cn) || {})._cn))
-          .map(c => this.value[c._cn]).join('___')) ||
-        (this.value && this.parentMeta && this.parentMeta.columns.filter(c => c.pk).map(c => this.value[c._cn]).join('___')))
+      return this.pid ?? (this.value && this.parentMeta && this.parentMeta.columns.filter(c => c.pk).map(c => this.value[c._cn]).join('___'))
     },
     parentPrimaryCol() {
       return this.parentMeta && (this.parentMeta.columns.find(c => c.pv) || {})._cn
     },
     parentPrimaryKey() {
-      // ((this.parentMeta.columns
-      //   .filter(c => c._cn === (this.parentMeta && (this.parentMeta.columns.find(c => c.cn === this.bt.cn) || {})._cn))
-      //   .map(c => this.value[c._cn]).join('___'))
-
-      console.log((this.parentMeta && (this.parentMeta.columns.find(c => c.cn === this.bt.cn) || {})._cn) ||
-        (this.parentMeta && (this.parentMeta.columns.find(c => c.pk) || {})._cn))
-      return (this.parentMeta && (this.parentMeta.columns.find(c => c.cn === this.bt.cn) || {})._cn) ||
-        (this.parentMeta && (this.parentMeta.columns.find(c => c.pk) || {})._cn)
+      return this.parentMeta && (this.parentMeta.columns.find(c => c.pk) || {})._cn
+    },
+    parentReferenceKey() {
+      console.log(this.parentMeta.columns.find(c => c.cn === this.bt.rcn))
+      return this.parentMeta && (this.parentMeta.columns.find(c => c.cn === this.bt.rcn) || {})._cn
+    },
+    parentReferenceVal() {
+      console.log(this.row)
+      console.log(this.row[this.parentReferenceKey])
+      return (this.row && this.row[this.parentReferenceKey]) || -1
     },
     parentQueryParams() {
       if (!this.parentMeta) {
@@ -225,6 +225,9 @@ export default {
         return Object.values(this.value || this.localState)[1]
       }
       return null
+    },
+    isByPass() {
+      return false
     }
   },
   watch: {
@@ -333,11 +336,11 @@ export default {
       const pid = pkColumns.map(c => parent[c._cn]).join('___')
       const id = this.meta.columns.filter(c => c.pk).map(c => this.row[c._cn]).join('___')
       const _cn = this.meta.columns.find(c => c.cn === this.bt.cn)._cn
-      let isNum = false
+      // let isNum = false
 
-      if (pkColumns.length === 1) {
-        isNum = ['float', 'integer'].includes(this.sqlUi.getAbstractType(pkColumns[0]))
-      }
+      // if (pkColumns.length === 1) {
+      //   isNum = ['float', 'integer'].includes(this.sqlUi.getAbstractType(pkColumns[0]))
+      // }
 
       if (this.isNew) {
         this.localState = parent
@@ -346,9 +349,8 @@ export default {
         this.newRecordModal = false
         return
       }
-
       await this.api.update(id, {
-        [_cn]: isNum ? +pid : pid
+        [_cn]: parseIfInteger(parent[this.parentReferenceKey])
       }, {
         [_cn]: this.value && this.value[this.parentPrimaryKey]
       })
@@ -427,6 +429,7 @@ export default {
  * @author Naveen MR <oof1lab@gmail.com>
  * @author Pranav C Balan <pranavxc@gmail.com>
  * @author Md Ishtiaque Zafar <ishtiaque.zafar92@gmail.com>
+ * @author Wing-Kam Wong <wingkwong.code@gmail.com>
  *
  * @license GNU AGPL version 3 or any later version
  *

From 452dcf52f712766edd35456c0584eb206e0ed309 Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 25 Feb 2022 12:48:53 +0800
Subject: [PATCH 8/9] chore: remove console log

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../spreadsheet/components/virtualCell/belongsToCell.vue       | 3 ---
 .../project/spreadsheet/components/virtualCell/hasManyCell.vue | 3 ---
 2 files changed, 6 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue
index 46ee1ebabe..37e383da07 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue
@@ -179,12 +179,9 @@ export default {
       return this.parentMeta && (this.parentMeta.columns.find(c => c.pk) || {})._cn
     },
     parentReferenceKey() {
-      console.log(this.parentMeta.columns.find(c => c.cn === this.bt.rcn))
       return this.parentMeta && (this.parentMeta.columns.find(c => c.cn === this.bt.rcn) || {})._cn
     },
     parentReferenceVal() {
-      console.log(this.row)
-      console.log(this.row[this.parentReferenceKey])
       return (this.row && this.row[this.parentReferenceKey]) || -1
     },
     parentQueryParams() {
diff --git a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
index f63cec4214..b6c6a21c45 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/hasManyCell.vue
@@ -225,15 +225,12 @@ export default {
       return this.meta && (this.meta.columns.find(c => c.pv) || {})._cn
     },
     childPrimaryKey() {
-      console.log('childPrimaryKey= ' + (this.childMeta && (this.childMeta.columns.find(c => c.pk) || {})._cn))
       return this.childMeta && (this.childMeta.columns.find(c => c.pk) || {})._cn
     },
     childForeignKey() {
-      console.log('childForeignKey= ' + (this.childMeta && (this.childMeta.columns.find(c => c.cn === this.hm.cn) || {})._cn))
       return this.childMeta && (this.childMeta.columns.find(c => c.cn === this.hm.cn) || {})._cn
     },
     childForeignKeyVal() {
-      console.log('childForeignKeyVal: ' + (this.meta && this.meta.columns ? this.meta.columns.filter(c => c._cn === this.childForeignKey).map(c => this.row[c._cn] || '').join('___') : ''))
       return this.meta && this.meta.columns ? this.meta.columns.filter(c => c._cn === this.childForeignKey).map(c => this.row[c._cn] || '').join('___') : ''
     },
     isVirtualRelation() {

From 20ad44989b5a88ec0ebbb23181fe760b1fc57b7e Mon Sep 17 00:00:00 2001
From: Wing-Kam Wong <wingkwong.code@gmail.com>
Date: Fri, 25 Feb 2022 18:23:41 +0800
Subject: [PATCH 9/9] fix: add btWhereClause

Signed-off-by: Wing-Kam Wong <wingkwong.code@gmail.com>
---
 .../components/virtualCell/belongsToCell.vue   | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue
index 37e383da07..c364688ffd 100644
--- a/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue
+++ b/packages/nc-gui/components/project/spreadsheet/components/virtualCell/belongsToCell.vue
@@ -36,8 +36,7 @@
       :api="parentApi"
       :query-params="{
         ...parentQueryParams,
-        isByPass,
-        where: isNew ? null :`~not(${parentReferenceKey},eq,${parentReferenceVal})~or(${parentReferenceKey},is,null)`,
+        where: isNew ? null :`${btWhereClause}`,
       }"
       :is-public="isPublic"
       :tn="bt && bt.rtn"
@@ -181,8 +180,16 @@ export default {
     parentReferenceKey() {
       return this.parentMeta && (this.parentMeta.columns.find(c => c.cn === this.bt.rcn) || {})._cn
     },
-    parentReferenceVal() {
-      return (this.row && this.row[this.parentReferenceKey]) || -1
+    btWhereClause() {
+      // if parent reference key is pk, then filter out the selected value
+      // else, filter out the selected value + empty values (as we can't set an empty value)
+      const prk = this.parentReferenceKey
+      const isPk = !!(this.parentMeta && (this.parentMeta.columns.find(c => c.pk && c._cn === prk))) || false
+      let selectedValue = this.meta && this.meta.columns ? this.meta.columns.filter(c => c.cn === this.bt.cn).map(c => this.row[c._cn] || '').join('___') : ''
+      if (this.parentMeta && (this.parentMeta.columns.find(c => c._cn === prk)).type !== 'string') {
+        selectedValue = selectedValue || 0
+      }
+      return `(${prk},not,${selectedValue})` + (!isPk ? `~and(${prk},not,)` : '')
     },
     parentQueryParams() {
       if (!this.parentMeta) {
@@ -223,9 +230,6 @@ export default {
       }
       return null
     },
-    isByPass() {
-      return false
-    }
   },
   watch: {
     isNew(n, o) {