fix: confirm fk and pk values match to detect m2m junction

7 months ago · 27558099c9
1 changed files with 5 additions and 1 deletions
--- a/packages/nocodb/src/helpers/populateMeta.ts
+++ b/packages/nocodb/src/helpers/populateMeta.ts
@ -93,7 +93,11 @@ export async function extractAndGenerateManyToManyRelations(
    if (
      belongsToCols?.length === 2 &&
      normalColumns.length < 5 &&
-      assocModel.primaryKeys.length === 2
+      assocModel.primaryKeys.length === 2 &&
+      // check if both belongsToCol target primary keys
+      assocModel.primaryKeys.every((pk) =>
+        belongsToCols.some((c) => c.colOptions?.fk_child_column_id === pk.id),
+      )
    ) {
      const modelA = await belongsToCols[0].colOptions.getRelatedTable();
      const modelB = await belongsToCols[1].colOptions.getRelatedTable();