From 44722688e907523532656e5fd48ddd3130cce160 Mon Sep 17 00:00:00 2001
From: Mert E <mertmit99@gmail.com>
Date: Mon, 8 Jul 2024 18:59:48 +0300
Subject: [PATCH] fix: avoid checking names cross-source (#8954)

---
 packages/nocodb/src/models/Model.ts | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/packages/nocodb/src/models/Model.ts b/packages/nocodb/src/models/Model.ts
index 40a3248635..6aaba1fae8 100644
--- a/packages/nocodb/src/models/Model.ts
+++ b/packages/nocodb/src/models/Model.ts
@@ -1029,7 +1029,11 @@ export default class Model implements TableType {
 
   static async checkTitleAvailable(
     context: NcContext,
-    { table_name, exclude_id }: { table_name; base_id; source_id; exclude_id? },
+    {
+      table_name,
+      source_id,
+      exclude_id,
+    }: { table_name; base_id; source_id; exclude_id? },
     ncMeta = Noco.ncMeta,
   ) {
     return !(await ncMeta.metaGet2(
@@ -1038,6 +1042,7 @@ export default class Model implements TableType {
       MetaTable.MODELS,
       {
         table_name,
+        ...(source_id ? { source_id } : {}),
       },
       null,
       exclude_id && { id: { neq: exclude_id } },
@@ -1046,7 +1051,11 @@ export default class Model implements TableType {
 
   static async checkAliasAvailable(
     context: NcContext,
-    { title, exclude_id }: { title; base_id; source_id; exclude_id? },
+    {
+      title,
+      source_id,
+      exclude_id,
+    }: { title; base_id; source_id; exclude_id? },
     ncMeta = Noco.ncMeta,
   ) {
     return !(await ncMeta.metaGet2(
@@ -1055,6 +1064,7 @@ export default class Model implements TableType {
       MetaTable.MODELS,
       {
         title,
+        ...(source_id ? { source_id } : {}),
       },
       null,
       exclude_id && { id: { neq: exclude_id } },