Changed compared key from name to type in generateJoinFields (#87)

* Changed compared key from name to type in generateJoinFields * Add changeset --------- Co-authored-by: Valtýr Örn Kjartansson <[email protected]>
valtyr · Feb 9, 2024 · 04de4dc · 04de4dc
1 parent 4526321
commit 04de4dc
Show file tree

Hide file tree

Showing 3 changed files with 228 additions and 1 deletion.
diff --git a/.changeset/cyan-kids-knock.md b/.changeset/cyan-kids-knock.md
@@ -0,0 +1,5 @@
+---
+"prisma-kysely": patch
+---
+
+Fixed automatic relation code generation bug. Thanks @Bayezid1989 🥳
diff --git a/src/helpers/generateImplicitManyToManyModels.test.ts b/src/helpers/generateImplicitManyToManyModels.test.ts
@@ -290,3 +290,225 @@ test("it filters out many-to-one relations safely", () => {
     },
   ]);
 });
+
+test("it generates correct field types when field types are defferent", () => {
+  const newModels = generateImplicitManyToManyModels([
+    {
+      name: "Category",
+      fields: [
+        {
+          name: "id",
+          type: "String",
+          isId: true,
+          hasDefaultValue: true,
+          isList: false,
+          isReadOnly: false,
+          isRequired: true,
+          isUnique: true,
+          kind: "scalar",
+        },
+        {
+          name: "posts",
+          kind: "object",
+          isList: true,
+          isRequired: true,
+          isUnique: false,
+          isId: false,
+          isReadOnly: false,
+          type: "Post",
+          hasDefaultValue: false,
+          relationName: "CategoryToPost",
+          relationFromFields: [],
+          relationToFields: [],
+          isGenerated: false,
+          isUpdatedAt: false,
+        },
+      ],
+      primaryKey: null,
+      dbName: null,
+      uniqueFields: [],
+      uniqueIndexes: [],
+    },
+    {
+      name: "Post",
+      fields: [
+        {
+          name: "id",
+          type: "Int",
+          isId: true,
+          hasDefaultValue: true,
+          isList: false,
+          isReadOnly: false,
+          isRequired: true,
+          isUnique: true,
+          kind: "scalar",
+        },
+        {
+          name: "categories",
+          kind: "object",
+          isList: true,
+          isRequired: true,
+          isUnique: false,
+          isId: false,
+          isReadOnly: false,
+          type: "Category",
+          hasDefaultValue: false,
+          relationName: "CategoryToPost",
+          relationFromFields: [],
+          relationToFields: [],
+          isGenerated: false,
+          isUpdatedAt: false,
+        },
+      ],
+      primaryKey: null,
+      dbName: null,
+      uniqueFields: [],
+      uniqueIndexes: [],
+    },
+  ]);
+
+  expect(newModels).toEqual<DMMF.Model[]>([
+    {
+      name: "CategoryToPost",
+      dbName: "_CategoryToPost",
+      fields: [
+        {
+          hasDefaultValue: false,
+          isId: false,
+          isList: false,
+          isReadOnly: true,
+          isRequired: true,
+          isUnique: false,
+          kind: "scalar",
+          name: "A",
+          type: "String",
+        },
+        {
+          hasDefaultValue: false,
+          isId: false,
+          isList: false,
+          isReadOnly: true,
+          isRequired: true,
+          isUnique: false,
+          kind: "scalar",
+          name: "B",
+          type: "Int",
+        },
+      ],
+      primaryKey: null,
+      uniqueFields: [],
+      uniqueIndexes: [],
+    },
+  ]);
+});
+
+test("it generates correct field types when a field name is defferent from model name", () => {
+  const newModels = generateImplicitManyToManyModels([
+    {
+      name: "Category",
+      fields: [
+        {
+          name: "id",
+          type: "String",
+          isId: true,
+          hasDefaultValue: true,
+          isList: false,
+          isReadOnly: false,
+          isRequired: true,
+          isUnique: true,
+          kind: "scalar",
+        },
+        {
+          name: "articles",
+          kind: "object",
+          isList: true,
+          isRequired: true,
+          isUnique: false,
+          isId: false,
+          isReadOnly: false,
+          type: "Post",
+          hasDefaultValue: false,
+          relationName: "CategoryToPost",
+          relationFromFields: [],
+          relationToFields: [],
+          isGenerated: false,
+          isUpdatedAt: false,
+        },
+      ],
+      primaryKey: null,
+      dbName: null,
+      uniqueFields: [],
+      uniqueIndexes: [],
+    },
+    {
+      name: "Post",
+      fields: [
+        {
+          name: "id",
+          type: "Int",
+          isId: true,
+          hasDefaultValue: true,
+          isList: false,
+          isReadOnly: false,
+          isRequired: true,
+          isUnique: true,
+          kind: "scalar",
+        },
+        {
+          name: "categories",
+          kind: "object",
+          isList: true,
+          isRequired: true,
+          isUnique: false,
+          isId: false,
+          isReadOnly: false,
+          type: "Category",
+          hasDefaultValue: false,
+          relationName: "CategoryToPost",
+          relationFromFields: [],
+          relationToFields: [],
+          isGenerated: false,
+          isUpdatedAt: false,
+        },
+      ],
+      primaryKey: null,
+      dbName: null,
+      uniqueFields: [],
+      uniqueIndexes: [],
+    },
+  ]);
+
+  expect(newModels).toEqual<DMMF.Model[]>([
+    {
+      name: "CategoryToPost",
+      dbName: "_CategoryToPost",
+      fields: [
+        {
+          hasDefaultValue: false,
+          isId: false,
+          isList: false,
+          isReadOnly: true,
+          isRequired: true,
+          isUnique: false,
+          kind: "scalar",
+          name: "A",
+          type: "String",
+        },
+        {
+          hasDefaultValue: false,
+          isId: false,
+          isList: false,
+          isReadOnly: true,
+          isRequired: true,
+          isUnique: false,
+          kind: "scalar",
+          name: "B",
+          type: "Int",
+        },
+      ],
+      primaryKey: null,
+      uniqueFields: [],
+      uniqueIndexes: [],
+    },
+  ]);
+});
diff --git a/src/helpers/generateImplicitManyToManyModels.ts b/src/helpers/generateImplicitManyToManyModels.ts
@@ -71,7 +71,7 @@ function generateJoinFields(
 ): DMMF.Field[] {
   if (fields.length !== 2) throw new Error("Huh?");
 
-  const sortedFields = sorted(fields, (a, b) => a.name.localeCompare(b.name));
+  const sortedFields = sorted(fields, (a, b) => a.type.localeCompare(b.type));
   const A = sortedFields[0];
   const B = sortedFields[1];